ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-26 06:18:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: gtk+: Use gexps and replace iso-codes/official with iso-codes.

Browse source 
* gnu/packages/gtk.scm (gtk+) [inputs]: Replace iso-codes/official with
iso-codes.
[arguments]: Use gexps.
This commit is contained in:
Maxim Cournoyer 2022-11-18 21:32:33 -05:00
parent 248b0f79c1
commit affaacf4f4
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 54 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

109
gnu/packages/gtk.scm
View file

@ -1023,64 +1023,63 @@ (define-public gtk+
xorg-server-for-tests xorg-server-for-tests
libxslt)) libxslt))
(arguments (arguments
`(#:imported-modules ((guix build glib-or-gtk-build-system) (list
#:imported-modules `((guix build glib-or-gtk-build-system)
,@%gnu-build-system-modules) ,@%gnu-build-system-modules)
#:modules ((guix build utils) #:modules '((guix build utils)
(guix build gnu-build-system) (guix build gnu-build-system)
((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:)) ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:))
#:disallowed-references (,xorg-server-for-tests) #:disallowed-references (list xorg-server-for-tests)
;; 47 MiB goes to "out" (24 of which is locale data!), and 26 MiB goes ;; 47 MiB goes to "out" (24 of which is locale data!), and 26 MiB goes
;; to "doc". ;; to "doc".
#:configure-flags (list (string-append "--with-html-dir=" #:configure-flags #~(list (string-append "--with-html-dir="
(assoc-ref %outputs "doc") #$output "/share/gtk-doc/html")
"/share/gtk-doc/html") "--enable-cloudproviders"
"--enable-cloudproviders" ;; The header file <gdk/gdkwayland.h> is required
;; The header file <gdk/gdkwayland.h> is required ;; by gnome-control-center
;; by gnome-control-center "--enable-wayland-backend"
"--enable-wayland-backend" ;; This is necessary to build both backends.
;; This is necessary to build both backends. "--enable-x11-backend"
"--enable-x11-backend" ;; This enables the HTML5 websocket backend.
;; This enables the HTML5 websocket backend. "--enable-broadway-backend")
"--enable-broadway-backend") #:phases
#:phases #~(modify-phases %standard-phases
(modify-phases %standard-phases (add-after 'unpack 'generate-gdk-pixbuf-loaders-cache-file
(add-after 'unpack 'generate-gdk-pixbuf-loaders-cache-file (assoc-ref glib-or-gtk:%standard-phases
(assoc-ref glib-or-gtk:%standard-phases 'generate-gdk-pixbuf-loaders-cache-file))
'generate-gdk-pixbuf-loaders-cache-file)) (add-after 'unpack 'disable-failing-tests
(add-after 'unpack 'disable-failing-tests (lambda _
(lambda _ (substitute* "testsuite/gtk/Makefile.in"
(substitute* "testsuite/gtk/Makefile.in" (("builderparser cellarea check-icon-names check-cursor-names")
(("builderparser cellarea check-icon-names check-cursor-names") "builderparser cellarea check-cursor-names")
"builderparser cellarea check-cursor-names") (("notify no-gtk-init object objects-finalize papersize rbtree")
(("notify no-gtk-init object objects-finalize papersize rbtree") "no-gtk-init papersize rbtree")
"no-gtk-init papersize rbtree") (("stylecontext templates textbuffer textiter treemodel treepath")
(("stylecontext templates textbuffer textiter treemodel treepath") "stylecontext textbuffer textiter treemodel treepath"))
"stylecontext textbuffer textiter treemodel treepath")) (substitute* "testsuite/a11y/Makefile.in"
(substitute* "testsuite/a11y/Makefile.in" (("accessibility-dump tree-performance text children derive")
(("accessibility-dump tree-performance text children derive") "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 = ")))) (add-before 'check 'pre-check
(add-before 'check 'pre-check (lambda _
(lambda _ ;; Tests require a running X server.
;; Tests require a running X server. (system "Xvfb :1 +extension GLX &")
(system "Xvfb :1 +extension GLX &") (setenv "DISPLAY" ":1")
(setenv "DISPLAY" ":1") ;; Tests write to $HOME.
;; Tests write to $HOME. (setenv "HOME" (getcwd))
(setenv "HOME" (getcwd)) ;; 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"))) (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) (mkdir-p (string-append #$output:bin "/share"))
(let ((out (assoc-ref outputs "out")) (rename-file (string-append #$output "/share/applications")
(bin (assoc-ref outputs "bin"))) (string-append #$output:bin
(mkdir-p (string-append bin "/share")) "/share/applications")))))))
(rename-file (string-append out "/share/applications")
(string-append bin "/share/applications"))))))))
(native-search-paths (native-search-paths
(list (search-path-specification (list (search-path-specification
(variable "GUIX_GTK3_PATH") (variable "GUIX_GTK3_PATH")