diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-09-26 14:40:26 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-09-27 10:05:55 -0400 |
| commit | 052c1b0643ce24cab73523096478f8b4f6202d7e (patch) | |
| tree | ab0d57afa91a77c0f45c5e16dfc2286cfd8051b1 /gnu | |
| parent | 1fe766fbe75330f96d9bec8ab8c86385fa68d1c9 (diff) | |
| download | guix-052c1b0643ce24cab73523096478f8b4f6202d7e.tar.gz | |
gnu: colord: Update to 1.4.6.
* gnu/packages/gnome.scm (colord): Update to 1.4.6. [source]: Override inherited field. [configure-flags]: Use gexps. [phases]: Likewise. [native-inputs]: Remove labels.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/gnome.scm | 60 |
1 files changed, 33 insertions, 27 deletions
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index c15d119b5c..c3bc3ca2fb 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5620,37 +5620,43 @@ output devices.") (define-public colord (package/inherit colord-minimal (name "colord") + (version "1.4.6") + (source + (origin + (method url-fetch) + (uri (string-append "https://www.freedesktop.org/software/colord/releases/" + "colord-" version ".tar.xz")) + (sha256 + (base32 "0vwfx06k1in8hci3kdxpc3c0bh81f1vl5bp7favd3rdz4wd661vl")))) (arguments - (substitute-keyword-arguments - (package-arguments colord-minimal) + (substitute-keyword-arguments (package-arguments colord-minimal) ((#:configure-flags flags) - `(begin - (use-modules (srfi srfi-1)) - (append '("-Dbash_completion=true" - "-Ddocs=true" - "-Dman=true" - "-Dvapi=true") - (fold delete ,flags '("-Dbash_completion=false" - "-Ddocs=false" - "-Dman=false"))))) + #~(begin + (use-modules (srfi srfi-1)) + (append '("-Dbash_completion=true" + "-Ddocs=true" + "-Dman=true" + "-Dvapi=true") + (fold delete #$flags '("-Dbash_completion=false" + "-Ddocs=false" + "-Dman=false"))))) ((#:phases phases) - `(modify-phases ,phases - (add-after 'unpack 'fix-bash-completion-dir - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "data/meson.build" - (("bash_completion.get_pkgconfig_variable\ + #~(modify-phases #$phases + (add-after 'unpack 'fix-bash-completion-dir + (lambda _ + (substitute* "data/meson.build" + (("bash_completion.get_pkgconfig_variable\ \\('completionsdir'\\)") - (string-append "'" (assoc-ref outputs "out") - "/etc/bash_completion.d'"))))))))) - (native-inputs - (append - `(("bash-completion" ,bash-completion) - ("docbook-xsl" ,docbook-xsl-1.79.1) - ("gtk-doc" ,gtk-doc/stable) - ("libxml2" ,libxml2) ;for XML_CATALOG_FILES - ("libxslt" ,libxslt) - ("vala" ,vala)) ;for VAPI, needed by simple-scan - (package-native-inputs colord-minimal))))) + (string-append "'" #$output + "/etc/bash_completion.d'"))))))))) + (native-inputs + (modify-inputs (package-native-inputs colord-minimal) + (append bash-completion + docbook-xsl-1.79.1 + gtk-doc/stable + libxml2 ;for XML_CATALOG_FILES + libxslt + vala))))) ;for VAPI, needed by simple-scan (define-public geoclue (package |