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

23
gnu/packages/gtk.scm
View file

@ -1023,17 +1023,17 @@ (define-public gtk+
xorg-server-for-tests
libxslt))
(arguments
`(#:imported-modules ((guix build glib-or-gtk-build-system)
(list
#:imported-modules `((guix build glib-or-gtk-build-system)
,@%gnu-build-system-modules)
#:modules ((guix build utils)
#:modules '((guix build utils)
(guix build gnu-build-system)
((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
;; to "doc".
#:configure-flags (list (string-append "--with-html-dir="
(assoc-ref %outputs "doc")
"/share/gtk-doc/html")
#:configure-flags #~(list (string-append "--with-html-dir="
#$output "/share/gtk-doc/html")
"--enable-cloudproviders"
;; The header file <gdk/gdkwayland.h> is required
;; by gnome-control-center
@ -1043,7 +1043,7 @@ (define-public gtk+
;; This enables the HTML5 websocket backend.
"--enable-broadway-backend")
#:phases
(modify-phases %standard-phases
#~(modify-phases %standard-phases
(add-after 'unpack 'generate-gdk-pixbuf-loaders-cache-file
(assoc-ref glib-or-gtk:%standard-phases
'generate-gdk-pixbuf-loaders-cache-file))
@ -1076,11 +1076,10 @@ (define-public gtk+
(add-after 'install 'move-desktop-files
;; Move desktop files into 'bin' to avoid cycle references.
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
(bin (assoc-ref outputs "bin")))
(mkdir-p (string-append bin "/share"))
(rename-file (string-append out "/share/applications")
(string-append bin "/share/applications"))))))))
(mkdir-p (string-append #$output:bin "/share"))
(rename-file (string-append #$output "/share/applications")
(string-append #$output:bin
"/share/applications")))))))
(native-search-paths
(list (search-path-specification
(variable "GUIX_GTK3_PATH")