From 20321f66d7f8b434b84d4f3f4cb6353367256bc7 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 21 Jul 2017 07:40:23 -0500 Subject: [PATCH] x264: unset AS Commit 093cc00cdd9d8cf31ecce5bc1dd3645c460a1b98 sets the environment variable `AS' to the binutils assembler, but x264 needs yasm. --- pkgs/development/libraries/x264/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/x264/default.nix b/pkgs/development/libraries/x264/default.nix index 6e4dc00b038..bf32969836c 100644 --- a/pkgs/development/libraries/x264/default.nix +++ b/pkgs/development/libraries/x264/default.nix @@ -15,6 +15,11 @@ stdenv.mkDerivation rec { 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" ] ++ stdenv.lib.optional (!stdenv.isi686) "--enable-pic" ++ stdenv.lib.optional (enable10bit) "--bit-depth=10";