diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-09-01 08:34:44 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-09-01 08:34:44 +0000 |
| commit | ccf8be72c625eee704b68c25364be3eaf7818418 (patch) | |
| tree | c50d37ed3ecbf1f0d8444ca811082b328ef59520 /pkgs/development/libraries/x264 | |
| parent | 517cc513318cc9db64bfaef3eee742229cc8801c (diff) | |
| download | nixpkgs-ccf8be72c625eee704b68c25364be3eaf7818418.tar nixpkgs-ccf8be72c625eee704b68c25364be3eaf7818418.tar.gz nixpkgs-ccf8be72c625eee704b68c25364be3eaf7818418.tar.bz2 nixpkgs-ccf8be72c625eee704b68c25364be3eaf7818418.tar.lz nixpkgs-ccf8be72c625eee704b68c25364be3eaf7818418.tar.xz nixpkgs-ccf8be72c625eee704b68c25364be3eaf7818418.tar.zst nixpkgs-ccf8be72c625eee704b68c25364be3eaf7818418.zip | |
Making the x264 libs build with PIC on non-i686, as it's the only platform I know that does not need PIC for shared libraries.
svn path=/nixpkgs/branches/stdenv-updates/; revision=23576
Diffstat (limited to 'pkgs/development/libraries/x264')
| -rw-r--r-- | pkgs/development/libraries/x264/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/development/libraries/x264/default.nix b/pkgs/development/libraries/x264/default.nix index 4bd1c97fb6c..9e5676e2012 100644 --- a/pkgs/development/libraries/x264/default.nix +++ b/pkgs/development/libraries/x264/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { sed -i s,/bin/bash,${stdenv.shell}, configure version.sh ''; - configureFlags = [ "--enable-shared" ]; + configureFlags = [ "--enable-shared" ] + ++ stdenv.lib.optional (!stdenv.isi686) "--enable-pic"; buildInputs = [ yasm ]; |