futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnu: gtk+: Delete trailing #t and use iso-codes.

Browse Source 
* gnu/packages/gtk.scm (gtk+)[inputs]: Replace iso-codes/official with
iso-codes.
[phases]: Delete trailing #t.
This commit is contained in:
Maxim Cournoyer 2022-08-21 21:05:52 -04:00
parent 9b2a3e023f
commit 91a830d028
No known key found for this signature in database
GPG Key ID: 1260E46482E63562
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gnu/packages/gtk.scm
View File

@ -977,8 +977,8 @@ application suites.")
fontconfig fontconfig
freetype freetype
(if (target-x86-64?) (if (target-x86-64?)
librsvg librsvg
librsvg-2.40) librsvg-2.40)
glib glib
libcloudproviders-minimal libcloudproviders-minimal
libepoxy libepoxy
@ -998,11 +998,11 @@ application suites.")
wayland wayland
wayland-protocols)) wayland-protocols))
(inputs (inputs
(list colord-minimal ;to prevent a cycle with inkscape (list colord-minimal ;to prevent a cycle with inkscape
cups cups
graphene graphene
harfbuzz harfbuzz
iso-codes/official ;XXX TODO core-updates: use iso-codes iso-codes
json-glib-minimal json-glib-minimal
libxml2 libxml2
rest)) rest))
@ -1059,8 +1059,7 @@ application suites.")
"tree-performance text children derive")) "tree-performance text children derive"))
(substitute* "testsuite/reftests/Makefile.in" (substitute* "testsuite/reftests/Makefile.in"
(("TEST_PROGS = gtk-reftest") (("TEST_PROGS = gtk-reftest")
"TEST_PROGS = ")) "TEST_PROGS = "))))
#t))
(add-before 'check 'pre-check (add-before 'check 'pre-check
(lambda _ (lambda _
;; Tests require a running X server. ;; Tests require a running X server.
@ -1071,8 +1070,7 @@ application suites.")
;; Tests look for $XDG_RUNTIME_DIR. ;; Tests look for $XDG_RUNTIME_DIR.
(setenv "XDG_RUNTIME_DIR" (getcwd)) (setenv "XDG_RUNTIME_DIR" (getcwd))
;; For missing '/etc/machine-id'. ;; For missing '/etc/machine-id'.
(setenv "DBUS_FATAL_WARNINGS" "0") (setenv "DBUS_FATAL_WARNINGS" "0")))
#t))
(add-after 'install 'move-desktop-files (add-after 'install 'move-desktop-files
;; Move desktop files into 'bin' to avoid cycle references. ;; Move desktop files into 'bin' to avoid cycle references.
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
@ -1080,8 +1078,7 @@ application suites.")
(bin (assoc-ref outputs "bin"))) (bin (assoc-ref outputs "bin")))
(mkdir-p (string-append bin "/share")) (mkdir-p (string-append bin "/share"))
(rename-file (string-append out "/share/applications") (rename-file (string-append out "/share/applications")
(string-append bin "/share/applications")) (string-append bin "/share/applications"))))))))
#t))))))
(native-search-paths (native-search-paths
(list (search-path-specification (list (search-path-specification
(variable "GUIX_GTK3_PATH") (variable "GUIX_GTK3_PATH")