mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-02-01 07:16:39 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: mplayer: Use #:configure-flags.

Browse source 
* gnu/packages/video.scm (mplayer)[arguments]: Move configure flags
to their proper keyword, and honour them in the 'configure phase.
This commit is contained in:
Tobias Geerinckx-Rice 2023-07-16 02:00:10 +02:00
parent 96727475fb
commit 806907ff83
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
1 changed files with 27 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
gnu/packages/video.scm
View file

@ -2112,40 +2112,42 @@ (define-public mplayer
(arguments
(list
#:tests? #f ; no test target
#:configure-flags
#~(list (string-append "--prefix=" #$output)
"--disable-ffmpeg_a" ; disables bundled ffmpeg
"--disable-iwmmxt"
(string-append "--extra-cflags=-I"
#$(this-package-input "libx11")
"/include") ; to detect libx11
;; Enable runtime cpu detection where supported,
;; and choose a suitable target.
#$@(match (or (%current-target-system)
(%current-system))
("x86_64-linux"
'("--enable-runtime-cpudetection"
"--target=x86_64-linux"))
("i686-linux"
'("--enable-runtime-cpudetection"
"--target=i686-linux"))
("mips64el-linux"
'("--target=mips3-linux"))
(_ (list (string-append
"--target="
(or (%current-target-system)
(nix-system->gnu-triplet
(%current-system))))))))
#:phases
#~(modify-phases %standard-phases
(replace 'configure
;; configure does not work followed by "SHELL=..." and
;; "CONFIG_SHELL=..."; set environment variables instead
(lambda* (#:key inputs outputs #:allow-other-keys)
(lambda* (#:key (configure-flags '()) #:allow-other-keys)
(substitute* "configure"
(("#! /bin/sh") (string-append "#!" (which "sh"))))
(setenv "SHELL" (which "bash"))
(setenv "CONFIG_SHELL" (which "bash"))
(invoke "./configure"
(string-append "--extra-cflags=-I"
#$(this-package-input "libx11")
"/include") ; to detect libx11
"--disable-ffmpeg_a" ; disables bundled ffmpeg
(string-append "--prefix=" #$output)
;; Enable runtime cpu detection where supported,
;; and choose a suitable target.
#$@(match (or (%current-target-system)
(%current-system))
("x86_64-linux"
'("--enable-runtime-cpudetection"
"--target=x86_64-linux"))
("i686-linux"
'("--enable-runtime-cpudetection"
"--target=i686-linux"))
("mips64el-linux"
'("--target=mips3-linux"))
(_ (list (string-append
"--target="
(or (%current-target-system)
(nix-system->gnu-triplet
(%current-system)))))))
"--disable-iwmmxt"))))))
(apply invoke "./configure" configure-flags))))))
;; FIXME: Add additional inputs once available.
(native-inputs
(list pkg-config yasm))