summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Graves <ngraves@ngraves.fr>2025-09-21 19:57:41 +0200
committerSharlatan Hellseher <sharlatanus@gmail.com>2025-09-21 19:27:36 +0100
commit2e3918d6f5cef76b3ac2cb8191c11e357d88189b (patch)
treeee593ade1b1190f0c2efb1eb96d5310802510488
parent848117a2634fd9534e497d154aa0984e11b5c4c5 (diff)
gnu: python-pycairo: Switch to meson-build-system.
For some reason, we lost pkg-config files using pyproject. Here the fix is trivial, but this might indicate a bigger issue. * gnu/packages/gtk.scm (python-pycairo) [source]: Switch to git-fetch. [build-system]: Switch to meson. [native-inputs]: Add python. Also remove a trailing lost comment. Change-Id: I3f59ab7b8150ce0b9de1a5b342ccfbb546039ec7 Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
-rw-r--r--gnu/packages/gtk.scm29
1 files changed, 9 insertions, 20 deletions
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 757e194889..f5d64ef3fb 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -2119,25 +2119,16 @@ printing and other features typical of a source code editor.")
(version "1.26.0")
(source
(origin
- (method url-fetch)
- ;; TODO: Try to build from git checkout instead GitHub release tarball.
- (uri (string-append "https://github.com/pygobject/pycairo/releases/download/v"
- version "/pycairo-" version ".tar.gz"))
- (sha256
- (base32
- "1sybz43sj4ynjahlkidrcdpdrq8yi1avkndc2hgb5pgvfjld1p9d"))))
- (build-system pyproject-build-system)
- (arguments
- (list
- ;; XXX: Project provides Meson build as well which may simplify the
- ;; packaging.
- #:phases
- #~(modify-phases %standard-phases
- (add-before 'check 'build-extensions
- (lambda _
- (invoke "python" "setup.py" "build_ext" "--inplace"))))))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/pygobject/pycairo")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0pqam2dxmp6b6r0pvarhiw1sp6p5nwlpyl2754aji445q4zcqj81"))))
+ (build-system meson-build-system)
(native-inputs
- (list pkg-config python-pytest python-setuptools))
+ (list pkg-config python python-pytest python-setuptools))
(propagated-inputs ;pycairo.pc references cairo
(list cairo))
(home-page "https://cairographics.org/pycairo/")
@@ -2148,8 +2139,6 @@ printing and other features typical of a source code editor.")
'((upstream-name . "pycairo")))
(license license:lgpl3+)))
-;; Pycairo no longer supports Python 2 since version 1.19.0, so we stick
-
(define-public perl-cairo
(package
(name "perl-cairo")