me
/
guix
Archived
1
0
Fork 0
Code

gnu: guile-present: Pass the right module directories in scripts. 

* gnu/packages/gtk.scm (guile-present)[arguments]: In 'post-install'
phase, remove hard-coded "2.0" and replace it by a computed effective
version.  Also, pass "/site-ccache" to -C.
master
Ludovic Courtès 2020-01-23 11:22:20 +01:00
parent b93cde3d8c
commit 897186c155
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gnu/packages/gtk.scm
View File

@ -84,7 +84,8 @@
#:use-module (gnu packages xorg) #:use-module (gnu packages xorg)
#:use-module (gnu packages xdisorg) #:use-module (gnu packages xdisorg)
#:use-module (srfi srfi-1) #:use-module (srfi srfi-1)
#:use-module (srfi srfi-26)) #:use-module (srfi srfi-26)
#:use-module (ice-9 match))
(define-public atk (define-public atk
(package (package
@ -956,18 +957,22 @@ images onto Cairo surfaces.")
#t)))) #t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'install 'post-install (add-after 'install 'post-install
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin")) (bin (string-append out "/bin"))
(guile (assoc-ref inputs "guile"))) (guile (assoc-ref inputs "guile"))
(version
,(match (assoc "guile" (package-inputs this-package))
(("guile" guile)
(version-major+minor (package-version guile))))))
(substitute* (find-files bin ".*") (substitute* (find-files bin ".*")
(("guile") (("guile")
(string-append guile "/bin/guile -L " (string-append guile "/bin/guile -L "
out "/share/guile/site/2.0 -C " out "/share/guile/site/" version " -C "
out "/share/guile/site/2.0 ")))) out "/lib/guile/" version "/site-ccache "))))
#t))))) #t)))))
(native-inputs `(("pkg-config" ,pkg-config))) (native-inputs `(("pkg-config" ,pkg-config)))
(inputs `(("guile" ,guile-2.2))) (inputs `(("guile" ,guile-2.2)))