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

gnu: ffmpeg: Use 'modify-phases'. 

* gnu/packages/video.scm (ffmpeg)[arguments]: Use 'modify-phases'
  instead of 'alist-cons-after' et al.
This commit is contained in:
Ludovic Courtès 2015-04-16 10:35:33 +02:00
parent e1600f6996
commit f2feb0ce7c
1 changed files with 54 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gnu/packages/video.scm
View File

@ -323,7 +323,8 @@ standards (MPEG-2, MPEG-4 ASP/H.263, MPEG-4 AVC/H.264, and VC-1/VMW3).")
#:imported-modules (,@%gnu-build-system-modules #:imported-modules (,@%gnu-build-system-modules
(guix build rpath)) (guix build rpath))
#:phases #:phases
(alist-replace (modify-phases %standard-phases
(replace
'configure 'configure
;; configure does not work followed by "SHELL=..." and ;; configure does not work followed by "SHELL=..." and
;; "CONFIG_SHELL=..."; set environment variables instead ;; "CONFIG_SHELL=..."; set environment variables instead
@ -409,8 +410,8 @@ standards (MPEG-2, MPEG-4 ASP/H.263, MPEG-4 AVC/H.264, and VC-1/VMW3).")
"--disable-mips32r2" "--disable-mips32r2"
"--disable-mipsdspr1" "--disable-mipsdspr1"
"--disable-mipsdspr2" "--disable-mipsdspr2"
"--disable-mipsfpu")))) "--disable-mipsfpu")))))
(alist-cons-after (add-after
'strip 'add-lib-to-runpath 'strip 'add-lib-to-runpath
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
@ -419,8 +420,7 @@ standards (MPEG-2, MPEG-4 ASP/H.263, MPEG-4 AVC/H.264, and VC-1/VMW3).")
(with-directory-excursion out (with-directory-excursion out
(for-each (cut augment-rpath <> lib) (for-each (cut augment-rpath <> lib)
(append (find-files "bin" ".*") (append (find-files "bin" ".*")
(find-files "lib" "\\.so\\..*\\.")))))) (find-files "lib" "\\.so\\..*\\."))))))))))
%standard-phases))))
(home-page "http://www.ffmpeg.org/") (home-page "http://www.ffmpeg.org/")
(synopsis "Audio and video framework") (synopsis "Audio and video framework")
(description "FFmpeg is a complete, cross-platform solution to record, (description "FFmpeg is a complete, cross-platform solution to record,