nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: guile-cairo: Use 'modify-phases'. 

* gnu/packages/gtk.scm (guile-cairo)[arguments]: Use 'modify-phases'.
This commit is contained in:
Ludovic Courtès 2017-03-13 22:18:13 +01:00
parent b111bceecc
commit b97438650d
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 30 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gnu/packages/gtk.scm
View File

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014, 2015, 2017 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2015, 2017 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch> ;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch>
@ -740,8 +740,8 @@ application suites.")
"1f5nd9n46n6cwfl1byjml02q3y2hgn7nkx98km1czgwarxl7ws3x")))) "1f5nd9n46n6cwfl1byjml02q3y2hgn7nkx98km1czgwarxl7ws3x"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases (alist-cons-before '(#:phases (modify-phases %standard-phases
'configure 'set-module-directory (add-before 'configure 'set-module-directory
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
;; Install modules under $out/share/guile/site/2.0. ;; Install modules under $out/share/guile/site/2.0.
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
@ -751,17 +751,15 @@ application suites.")
(substitute* "cairo/Makefile.in" (substitute* "cairo/Makefile.in"
(("moduledir = ([[:graph:]]+).*" _ value) (("moduledir = ([[:graph:]]+).*" _ value)
(string-append "moduledir = " (string-append "moduledir = "
"$(prefix)/share/guile/site/2.0/cairo\n'"))))) "$(prefix)/share/guile/site/2.0/cairo\n'"))))))
(alist-cons-after (add-after 'install 'install-missing-file
'install 'install-missing-file
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
;; By default 'vector-types.scm' is not installed, so do ;; By default 'vector-types.scm' is not installed, so do
;; it here. ;; it here.
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
(copy-file "cairo/vector-types.scm" (copy-file "cairo/vector-types.scm"
(string-append out "/share/guile/site/2.0" (string-append out "/share/guile/site/2.0"
"/cairo/vector-types.scm")))) "/cairo/vector-types.scm"))))))))
%standard-phases))))
(inputs (inputs
`(("guile-lib" ,guile-lib) `(("guile-lib" ,guile-lib)
("expat" ,expat) ("expat" ,expat)