diff options
| author | hsloan <ishaqsloan@gmail.com> | 2017-06-28 16:13:11 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-06-28 19:33:46 -0400 |
| commit | 58196b607e18c3c99268d40a0fee60462dccbdaf (patch) | |
| tree | f7cb73a33df190f5cc913e35877eafd121ee61ff /pkgs/development/libraries/libav | |
| parent | de1125ea2caca9ca76dc1b4ade84565b5547ca0c (diff) | |
| download | nixlib-58196b607e18c3c99268d40a0fee60462dccbdaf.tar nixlib-58196b607e18c3c99268d40a0fee60462dccbdaf.tar.gz nixlib-58196b607e18c3c99268d40a0fee60462dccbdaf.tar.bz2 nixlib-58196b607e18c3c99268d40a0fee60462dccbdaf.tar.lz nixlib-58196b607e18c3c99268d40a0fee60462dccbdaf.tar.xz nixlib-58196b607e18c3c99268d40a0fee60462dccbdaf.tar.zst nixlib-58196b607e18c3c99268d40a0fee60462dccbdaf.zip | |
libav: Don't use stdenv.cross
Diffstat (limited to 'pkgs/development/libraries/libav')
| -rw-r--r-- | pkgs/development/libraries/libav/default.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index 785e3599bf17..3d4fbab3e422 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -13,6 +13,7 @@ , SDL # only for avplay in $bin, adds nontrivial closure to it , enableGPL ? true # ToDo: some additional default stuff may need GPL , enableUnfree ? faacSupport +, hostPlatform }: assert faacSupport -> enableUnfree; @@ -107,10 +108,10 @@ let crossAttrs = { configurePlatforms = []; configureFlags = configureFlags ++ [ - "--cross-prefix=${stdenv.cross.config}-" + "--cross-prefix=${stdenv.cc.prefix}" "--enable-cross-compile" "--target_os=linux" - "--arch=${stdenv.cross.arch}" + "--arch=${hostPlatform.arch}" ]; }; |