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

gnu: libepoxy: Use 'modify-phases'. 

* gnu/packages/gl.scm (libepoxy)[arguments]: Use 'modify-phases' syntax.
This commit is contained in:
Efraim Flashner 2016-08-23 21:28:24 +03:00
parent 70cf677c5c
commit 5f8dd6dca8
No known key found for this signature in database
GPG Key ID: F4C1D3917EACEE93
1 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
gnu/packages/gl.scm
View File

@ -465,32 +465,32 @@ OpenGL graphics API.")
"1d1brhwfmlzgnphmdwlvn5wbcrxsdyzf1qfcf8nb89xqzznxs037")))) "1d1brhwfmlzgnphmdwlvn5wbcrxsdyzf1qfcf8nb89xqzznxs037"))))
(arguments (arguments
`(#:phases `(#:phases
(alist-cons-after (modify-phases %standard-phases
'unpack 'autoreconf (add-after
(lambda _ 'unpack 'autoreconf
(zero? (system* "autoreconf" "-vif"))) (lambda _
(alist-cons-before (zero? (system* "autoreconf" "-vif"))))
'configure 'patch-paths (add-before
(lambda* (#:key inputs #:allow-other-keys) 'configure 'patch-paths
(let ((python (assoc-ref inputs "python")) (lambda* (#:key inputs #:allow-other-keys)
(mesa (assoc-ref inputs "mesa"))) (let ((python (assoc-ref inputs "python"))
(substitute* "src/gen_dispatch.py" (mesa (assoc-ref inputs "mesa")))
(("/usr/bin/env python") python)) (substitute* "src/gen_dispatch.py"
(substitute* (find-files "." "\\.[ch]$") (("/usr/bin/env python") python))
(("libGL.so.1") (string-append mesa "/lib/libGL.so.1")) (substitute* (find-files "." "\\.[ch]$")
(("libEGL.so.1") (string-append mesa "/lib/libEGL.so.1"))) (("libGL.so.1") (string-append mesa "/lib/libGL.so.1"))
(("libEGL.so.1") (string-append mesa "/lib/libEGL.so.1")))
;; XXX On armhf systems, we must add "GLIBC_2.4" to the list of ;; XXX On armhf systems, we must add "GLIBC_2.4" to the list of
;; versions in test/dlwrap.c:dlwrap_real_dlsym. It would be ;; versions in test/dlwrap.c:dlwrap_real_dlsym. It would be
;; better to make this a normal patch, but for now we do it here ;; better to make this a normal patch, but for now we do it here
;; to prevent rebuilding on other platforms. ;; to prevent rebuilding on other platforms.
,@(if (string-prefix? "arm" (or (%current-target-system) ,@(if (string-prefix? "arm" (or (%current-target-system)
(%current-system))) (%current-system)))
'((substitute* '"test/dlwrap.c" '((substitute* '"test/dlwrap.c"
(("\"GLIBC_2\\.0\"") "\"GLIBC_2.0\", \"GLIBC_2.4\""))) (("\"GLIBC_2\\.0\"") "\"GLIBC_2.0\", \"GLIBC_2.4\"")))
'()) '())
#t)) #t))))))
%standard-phases))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("autoconf" ,autoconf) `(("autoconf" ,autoconf)