diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-04-09 18:28:16 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-04-12 18:46:15 +0000 |
commit | fd2e737e0678ee7d8081baef05b305146a2c0034 (patch) | |
tree | ac3e9b27576a0382335532d126f9a66d486bc638 /nixpkgs/pkgs/development/libraries/x264 | |
parent | cc207d720b6aa836e256c1ee9842bc739e630a8a (diff) | |
parent | 9e377a6ce42dccd9b624ae4ce8f978dc892ba0e2 (diff) | |
download | nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.gz nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.bz2 nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.lz nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.xz nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.zst nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.zip |
Merge remote-tracking branch 'nixpkgs/nixos-unstable'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/x264')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/x264/default.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/development/libraries/x264/default.nix b/nixpkgs/pkgs/development/libraries/x264/default.nix index 93d0b42a889f..5b82c594b086 100644 --- a/nixpkgs/pkgs/development/libraries/x264/default.nix +++ b/nixpkgs/pkgs/development/libraries/x264/default.nix @@ -1,4 +1,6 @@ -{ stdenv, lib, fetchurl, nasm }: +{ stdenv, lib, fetchurl, nasm +, enableShared ? !stdenv.hostPlatform.isStatic + }: stdenv.mkDerivation rec { pname = "x264"; @@ -28,7 +30,7 @@ stdenv.mkDerivation rec { export AS=$CC ''; - configureFlags = [ "--enable-shared" ] + configureFlags = lib.optional enableShared "--enable-shared" ++ lib.optional (!stdenv.isi686) "--enable-pic" ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "--cross-prefix=${stdenv.cc.targetPrefix}"; |