TakeV/guix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

gnu: gettext: Use "modify-phases" syntax.

Browse source 
* gnu/packages/gettext.scm (gettext)[arguments]: Use "modify-phases" syntax.
This commit is contained in:
Efraim Flashner 2016-01-05 21:13:57 +02:00
parent d99861d39d
commit e5f037624e
1 changed files with 29 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gnu/packages/gettext.scm
View file

@ -55,8 +55,9 @@ (define-public gnu-gettext
(inputs
`(("expat" ,expat)))
(arguments
`(#:phases (alist-cons-before
'check 'patch-tests
`(#:phases
(modify-phases %standard-phases
(add-before 'check 'patch-tests
(lambda* (#:key inputs #:allow-other-keys)
(let* ((bash (which "sh")))
;; Some of the files we're patching are
@ -77,16 +78,14 @@ (define-public gnu-gettext
(substitute* "gettext-tools/src/project-id"
(("/bin/pwd")
"pwd")))))
(alist-cons-before
'configure 'link-expat
"pwd"))))))
(add-before 'configure 'link-expat
(lambda _
;; Gettext defaults to opening expat via dlopen on
;; "Linux". Change to link directly.
(substitute* "gettext-tools/configure"
(("LIBEXPAT=\"-ldl\"") "LIBEXPAT=\"-ldl -lexpat\"")
(("LTLIBEXPAT=\"-ldl\"") "LTLIBEXPAT=\"-ldl -lexpat\"")))
%standard-phases))
(("LTLIBEXPAT=\"-ldl\"") "LTLIBEXPAT=\"-ldl -lexpat\"")))))
;; When tests fail, we want to know the details.
#:make-flags '("VERBOSE=yes")))