Archived
1
0
Fork 0

gnu: entangle: Update package style.

* gnu/packages/photo.scm (entangle)[arguments]: Rewrite as G-expressions.
Don't explicitly return #t from phases.
[native-inputs]: Remove input labels.
This commit is contained in:
Tobias Geerinckx-Rice 2023-08-06 02:00:00 +02:00
parent efcdf66fe2
commit 2d4ee4677e
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79

View file

@ -629,9 +629,10 @@ such as Batch image processing.")
(base32 "1pdmgxjdb3xlcqsaz7l8qzj5f7g7nwzhsrgid8929bm36d49cgc7")))) (base32 "1pdmgxjdb3xlcqsaz7l8qzj5f7g7nwzhsrgid8929bm36d49cgc7"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
`(#:glib-or-gtk? #t (list
#:glib-or-gtk? #t
#:phases #:phases
(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'build-with-meson-0.60 (add-after 'unpack 'build-with-meson-0.60
;; Work around ERROR: Function does not take positional arguments.. ;; Work around ERROR: Function does not take positional arguments..
(lambda _ (lambda _
@ -642,28 +643,25 @@ such as Batch image processing.")
;; Don't create 'icon-theme.cache'. ;; Don't create 'icon-theme.cache'.
(lambda _ (lambda _
(substitute* "meson_post_install.py" (substitute* "meson_post_install.py"
(("gtk-update-icon-cache") "true")) (("gtk-update-icon-cache") "true"))))
#t))
(add-after 'install 'wrap-gi-python (add-after 'install 'wrap-gi-python
;; Make GTK find files needed by plugins. ;; Make GTK find files needed by plugins.
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")) (let ((gi-typelib-path (getenv "GI_TYPELIB_PATH"))
(gi-typelib-path (getenv "GI_TYPELIB_PATH"))
(python-path (getenv "GUIX_PYTHONPATH"))) (python-path (getenv "GUIX_PYTHONPATH")))
(wrap-program (string-append out "/bin/entangle") (wrap-program (string-append #$output "/bin/entangle")
`("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)) `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))
`("GUIX_PYTHONPATH" ":" prefix (,python-path)))) `("GUIX_PYTHONPATH" ":" prefix (,python-path)))))))))
#t)))))
(native-inputs (native-inputs
`(("cmake" ,cmake) (list cmake
("gettext" ,gettext-minimal) gettext-minimal
("glib:bin" ,glib "bin") `(,glib "bin")
("gobject-introspection" ,gobject-introspection) gobject-introspection
("gtk-doc" ,gtk-doc) gtk-doc
("itstool" ,itstool) itstool
("perl" ,perl) libxml2
("pkg-config" ,pkg-config) perl
("xmllint" ,libxml2))) pkg-config))
(inputs (inputs
(list gdk-pixbuf (list gdk-pixbuf
gexiv2 gexiv2