mirror of
https://git.savannah.gnu.org/git/guix.git
synced 2025-01-19 14:07:01 +01:00
gnu: python-waf: Use a proper directory structure.
Fixes <https://bugs.gnu.org/25634>. * gnu/packages/python.scm (python-waf): Replace custom 'install phase to install "waf" binary into the bin directory. Remove the 'wrap phase. * gnu/packages/video.scm (mpv)[arguments]: Adjust the 'setup-waf phase accordingly.
This commit is contained in:
parent
96cae1b48c
commit
a2aa746cfe
2 changed files with 8 additions and 4 deletions
|
@ -5692,9 +5692,12 @@ (define-public python-waf
|
|||
(lambda _
|
||||
(invoke "python" "waf" "--version")))
|
||||
(replace 'install
|
||||
(lambda _
|
||||
(copy-file "waf" %output)
|
||||
#t)))))
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out")))
|
||||
(install-file "waf" (string-append out "/bin")))
|
||||
#t))
|
||||
;; waf breaks when it is wrapped.
|
||||
(delete 'wrap))))
|
||||
(home-page "https://waf.io/")
|
||||
(synopsis "Python-based build system")
|
||||
(description
|
||||
|
|
|
@ -1180,7 +1180,8 @@ (define-public mpv
|
|||
(add-before
|
||||
'configure 'setup-waf
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(copy-file (assoc-ref inputs "waf") "waf")
|
||||
(let ((waf (assoc-ref inputs "waf")))
|
||||
(copy-file (string-append waf "/bin/waf") "waf"))
|
||||
(setenv "CC" "gcc")
|
||||
#t)))
|
||||
#:configure-flags (list "--enable-libmpv-shared"
|
||||
|
|
Loading…
Reference in a new issue