mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-27 06:42:14 -05:00
gnu: gtk+-2: Split binaries.
* gnu/packages/gtk.scm (gtk+-2): Add "bin" output. * guix/profiles.scm (gtk-im-modules): Use "bin" output for generating gtk+-2 immodules cache file.
This commit is contained in:
parent
7b90379db8
commit
e8cbebb476
2 changed files with 17 additions and 11 deletions
|
@ -672,7 +672,7 @@ (define-public gtk+-2
|
|||
"gtk2-respect-GUIX_GTK2_IM_MODULE_FILE.patch"
|
||||
"gtk2-theme-paths.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(outputs '("out" "doc"))
|
||||
(outputs '("out" "bin" "doc"))
|
||||
(propagated-inputs
|
||||
`(("atk" ,atk)
|
||||
("gdk-pixbuf" ,gdk-pixbuf+svg)
|
||||
|
@ -699,14 +699,19 @@ (define-public gtk+-2
|
|||
(assoc-ref %outputs "doc")
|
||||
"/share/gtk-doc/html"))
|
||||
#:phases
|
||||
(alist-cons-before
|
||||
'configure 'disable-tests
|
||||
(lambda _
|
||||
;; FIXME: re-enable tests requiring an X server
|
||||
(substitute* "gtk/Makefile.in"
|
||||
(("SUBDIRS = theme-bits . tests") "SUBDIRS = theme-bits ."))
|
||||
#t)
|
||||
%standard-phases)))
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'configure 'disable-tests
|
||||
(lambda _
|
||||
;; FIXME: re-enable tests requiring an X server
|
||||
(substitute* "gtk/Makefile.in"
|
||||
(("SUBDIRS = theme-bits . tests") "SUBDIRS = theme-bits ."))
|
||||
#t))
|
||||
(add-after 'install 'remove-cache
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(for-each
|
||||
delete-file
|
||||
(find-files (assoc-ref outputs "out") "immodules.cache"))
|
||||
#t)))))
|
||||
(native-search-paths
|
||||
(list (search-path-specification
|
||||
(variable "GUIX_GTK2_PATH")
|
||||
|
@ -734,7 +739,6 @@ (define-public gtk+
|
|||
"10xyyhlfb0yk4hglngxh2zsv9xrxkqv343df8h01dvagc6jyp10k"))
|
||||
(patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch"
|
||||
"gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch"))))
|
||||
(outputs '("out" "bin" "doc"))
|
||||
(propagated-inputs
|
||||
`(("at-spi2-atk" ,at-spi2-atk)
|
||||
("atk" ,atk)
|
||||
|
|
|
@ -1106,6 +1106,8 @@ (define (build gtk gtk-version query)
|
|||
;; Don't run the hook when there's nothing to do.
|
||||
(let* ((pkg-gtk+ (module-ref ; lazy reference
|
||||
(resolve-interface '(gnu packages gtk)) 'gtk+))
|
||||
(pkg-gtk+2 (module-ref ; lazy reference
|
||||
(resolve-interface '(gnu packages gtk)) 'gtk+-2))
|
||||
(gexp #~(begin
|
||||
#$(if gtk+
|
||||
(build
|
||||
|
@ -1119,7 +1121,7 @@ (define (build gtk gtk-version query)
|
|||
(build
|
||||
gtk+-2 "2.10.0"
|
||||
#~(string-append
|
||||
#$gtk+-2 "/bin/gtk-query-immodules-2.0"))
|
||||
#$pkggtk+-2:bin "/bin/gtk-query-immodules-2.0"))
|
||||
#t))))
|
||||
(if (or gtk+ gtk+-2)
|
||||
(gexp->derivation "gtk-im-modules" gexp
|
||||
|
|
Loading…
Reference in a new issue