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

libav: Don't use stdenv.cross

Browse Source
This commit is contained in:
hsloan 2017-06-28 16:13:11 -04:00 committed by John Ericson
parent de1125ea2c
commit 58196b607e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/libraries/libav/default.nix
View File

@ -13,6 +13,7 @@
, SDL # only for avplay in $bin, adds nontrivial closure to it , SDL # only for avplay in $bin, adds nontrivial closure to it
, enableGPL ? true # ToDo: some additional default stuff may need GPL , enableGPL ? true # ToDo: some additional default stuff may need GPL
, enableUnfree ? faacSupport , enableUnfree ? faacSupport
, hostPlatform
}: }:
assert faacSupport -> enableUnfree; assert faacSupport -> enableUnfree;
@ -107,10 +108,10 @@ let
crossAttrs = { crossAttrs = {
configurePlatforms = []; configurePlatforms = [];
configureFlags = configureFlags ++ [ configureFlags = configureFlags ++ [
"--cross-prefix=${stdenv.cross.config}-" "--cross-prefix=${stdenv.cc.prefix}"
"--enable-cross-compile" "--enable-cross-compile"
"--target_os=linux" "--target_os=linux"
"--arch=${stdenv.cross.arch}" "--arch=${hostPlatform.arch}"
]; ];
}; };