public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x264: unset AS

Browse Source 
Commit 093cc00cdd sets the environment variable
`AS' to the binutils assembler, but x264 needs yasm.
This commit is contained in:
Thomas Tuegel
2017-07-21 15:47:12 -05:00
parent 631f6b3e11
commit 20321f66d7
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/x264/default.nix
+5
View File
@@ -15,6 +15,11 @@ stdenv.mkDerivation rec {
outputs = [ "out" "lib" ]; # leaving 52 kB of headers outputs = [ "out" "lib" ]; # leaving 52 kB of headers
preConfigure = ''
# `AS' is set to the binutils assembler, but we need yasm
unset AS
'';
configureFlags = [ "--enable-shared" ] configureFlags = [ "--enable-shared" ]
++ stdenv.lib.optional (!stdenv.isi686) "--enable-pic" ++ stdenv.lib.optional (!stdenv.isi686) "--enable-pic"
++ stdenv.lib.optional (enable10bit) "--bit-depth=10"; ++ stdenv.lib.optional (enable10bit) "--bit-depth=10";