diff options
| author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2024-01-01 21:56:00 +0100 |
|---|---|---|
| committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2024-01-01 21:56:00 +0100 |
| commit | 1cd97066c2dc84c6e538cfa63820e18f6c12a414 (patch) | |
| tree | 973b920b3f7c551a4baed8ce87147c2591ce3086 /gnu/packages/gnome.scm | |
| parent | b8175bc85a9709e29b60a0b56bafa56ca790383b (diff) | |
| parent | ee0cf3b9ff4cd5a9d3637d09677195ea9ee1a8c0 (diff) | |
| download | guix-1cd97066c2dc84c6e538cfa63820e18f6c12a414.tar.gz | |
Merge branch 'master' into gnome-team
Diffstat (limited to 'gnu/packages/gnome.scm')
| -rw-r--r-- | gnu/packages/gnome.scm | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index de80b6f836..84f1d2be11 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7557,7 +7557,7 @@ metadata in photo and video files of various formats.") libwebp libxml2 sqlite - webkitgtk)) + webkitgtk-for-gtk3)) (home-page "https://wiki.gnome.org/Apps/Shotwell") (synopsis "Photo manager for GNOME 3") (description @@ -11872,19 +11872,18 @@ functionality.") "1s4lqy883s296mbh4fywd1l3z79811ia00xs57c316pb1an97mmd")))) (build-system meson-build-system) (arguments - `(#:glib-or-gtk? #t - #:configure-flags - ;; Ensure the RUNPATH contains all installed library locations. - (list (string-append "-Dc_link_args=-Wl,-rpath=" - (assoc-ref %outputs "out") - "/lib/gthumb/extensions") - (string-append "-Dcpp_link_args=-Wl,-rpath=" - (assoc-ref %outputs "out") - "/lib/gthumb/extensions")))) - (native-inputs - (list desktop-file-utils ; for update-desktop-database - `(,glib "bin") ; for glib-compile-resources - `(,gtk+ "bin") ; for gtk-update-icon-cache + (list + #:glib-or-gtk? #t + #:configure-flags + ;; Ensure the RUNPATH contains all installed library locations. + #~(list (string-append "-Dc_link_args=-Wl,-rpath=" #$output + "/lib/gthumb/extensions") + (string-append "-Dcpp_link_args=-Wl,-rpath=" #$output + "/lib/gthumb/extensions")))) + (native-inputs + (list desktop-file-utils ; for update-desktop-database + `(,glib "bin") ; for glib-compile-resources + `(,gtk+ "bin") ; for gtk-update-icon-cache intltool itstool pkg-config |