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

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:
Efraim Flashner 2018-11-21 15:17:12 +02:00
parent 4e94cdb652
commit 24a2e19c43
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gnu/packages/python.scm
View File

@ -5607,9 +5607,12 @@ so it might be a tiny bit slower.")
(lambda _ (lambda _
(invoke "python" "waf" "--version"))) (invoke "python" "waf" "--version")))
(replace 'install (replace 'install
(lambda _ (lambda* (#:key outputs #:allow-other-keys)
(copy-file "waf" %output) (let ((out (assoc-ref outputs "out")))
#t))))) (install-file "waf" (string-append out "/bin")))
#t))
;; waf breaks when it is wrapped.
(delete 'wrap))))
(home-page "https://waf.io/") (home-page "https://waf.io/")
(synopsis "Python-based build system") (synopsis "Python-based build system")
(description (description

3
gnu/packages/video.scm
View File

@ -1180,7 +1180,8 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.")
(add-before (add-before
'configure 'setup-waf 'configure 'setup-waf
(lambda* (#:key inputs #:allow-other-keys) (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") (setenv "CC" "gcc")
#t))) #t)))
#:configure-flags (list "--enable-libmpv-shared" #:configure-flags (list "--enable-libmpv-shared"