me
/
guix
Archived
1
0
Fork 0
Code

gnu: meld: Use new package style. 

* gnu/packages/patchutils.scm (meld)[arguments]: Convert to list of
G-Expressions.
<#:phases>: Drop trailing #t.
[inputs, native-inputs]: Drop labels.

Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
Andy Tai 2023-02-22 22:37:36 -08:00 committed by Liliana Marie Prikler
parent f9f9efc467
commit 7fc415aba9
No known key found for this signature in database
GPG Key ID: 442A84B8C70E2F87
1 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
gnu/packages/patchutils.scm
View File

@ -232,50 +232,50 @@ GiB).")
(base32 "03f4j27amyi28flkks8i9bhqzd6xhm6d3c6jzxc57rzniv4hgh9z")))) (base32 "03f4j27amyi28flkks8i9bhqzd6xhm6d3c6jzxc57rzniv4hgh9z"))))
(build-system meson-build-system) (build-system meson-build-system)
(native-inputs (native-inputs
`(("desktop-file-utils" ,desktop-file-utils) (list desktop-file-utils
("intltool" ,intltool) intltool
("itstool" ,itstool) itstool
("xmllint" ,libxml2) libxml2
("glib-compile-schemas" ,glib "bin") `(,glib "bin") ; for glib-compile-schemas
("gobject-introspection" ,gobject-introspection) gobject-introspection
("pkg-config" ,pkg-config) pkg-config
("python" ,python))) python))
(inputs (inputs
`(("bash-minimal" ,bash-minimal) (list bash-minimal
("python" ,python) python
("python-cairo" ,python-pycairo) python-pycairo
("python-gobject" ,python-pygobject) python-pygobject
("gsettings-desktop-schemas" ,gsettings-desktop-schemas) gsettings-desktop-schemas
("gtksourceview" ,gtksourceview-4))) gtksourceview-4))
(propagated-inputs (propagated-inputs
(list dconf)) (list dconf))
(arguments (arguments
`(#:glib-or-gtk? #t (list
#:imported-modules (,@%meson-build-system-modules #:glib-or-gtk? #t
#:imported-modules `(,@%meson-build-system-modules
(guix build python-build-system)) (guix build python-build-system))
#:modules ((guix build meson-build-system) #:modules '((guix build meson-build-system)
((guix build python-build-system) #:prefix python:) ((guix build python-build-system) #:prefix python:)
(guix build utils)) (guix build utils))
#:phases #:phases
(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'skip-gtk-update-icon-cache (add-after 'unpack 'skip-gtk-update-icon-cache
;; 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") (which "true"))))) (("gtk-update-icon-cache") (which "true")))))
(add-after 'install 'copy-styles (add-after 'install 'copy-styles
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let ((styles "/share/gtksourceview-4/styles")) (let ((styles "/share/gtksourceview-4/styles"))
(copy-recursively (copy-recursively
(string-append (assoc-ref inputs "gtksourceview") styles) (string-append (assoc-ref inputs "gtksourceview") styles)
(string-append (assoc-ref outputs "out") styles)) (string-append (assoc-ref outputs "out") styles)))))
#t))) (add-after 'glib-or-gtk-wrap 'python-and-gi-wrap
(add-after 'glib-or-gtk-wrap 'python-and-gi-wrap (lambda* (#:key inputs outputs #:allow-other-keys)
(lambda* (#:key inputs outputs #:allow-other-keys) (wrap-program (search-input-file outputs "bin/meld")
(wrap-program (search-input-file outputs "bin/meld") `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH")
`("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH") ,(python:site-packages inputs outputs)))
,(python:site-packages inputs outputs))) `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))))))))
`("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))))))))
(home-page "https://meldmerge.org/") (home-page "https://meldmerge.org/")
(synopsis "Compare files, directories and working copies") (synopsis "Compare files, directories and working copies")
(description "Meld is a visual diff and merge tool targeted at (description "Meld is a visual diff and merge tool targeted at