diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-10 01:38:51 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-10 01:57:49 -0400 |
| commit | 7864a17bfb1fce9195e024e1e2ff1dfa14a942f3 (patch) | |
| tree | 2d7cdca82117aa19e295ae43f2f93fa91e2586d8 /pkgs/development/libraries/ffmpeg | |
| parent | 7d0906eea89f94b24d9df9af90579a88422dc126 (diff) | |
| download | nixlib-7864a17bfb1fce9195e024e1e2ff1dfa14a942f3.tar nixlib-7864a17bfb1fce9195e024e1e2ff1dfa14a942f3.tar.gz nixlib-7864a17bfb1fce9195e024e1e2ff1dfa14a942f3.tar.bz2 nixlib-7864a17bfb1fce9195e024e1e2ff1dfa14a942f3.tar.lz nixlib-7864a17bfb1fce9195e024e1e2ff1dfa14a942f3.tar.xz nixlib-7864a17bfb1fce9195e024e1e2ff1dfa14a942f3.tar.zst nixlib-7864a17bfb1fce9195e024e1e2ff1dfa14a942f3.zip | |
misc video players: Clean up cross
Diffstat (limited to 'pkgs/development/libraries/ffmpeg')
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/generic.nix | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 530639d757de..b71a1c253c11 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -79,7 +79,10 @@ stdenv.mkDerivation rec { ++ optional (reqMin "1.0") "doc" ; # just dev-doc setOutputFlags = false; # doesn't accept all and stores configureFlags in libs! + configurePlatforms = []; configureFlags = [ + "--arch=${hostPlatform.parsed.cpu.name}" + "--target_os=${hostPlatform.parsed.kernel.name}" # License "--enable-gpl" "--enable-version3" @@ -145,6 +148,9 @@ stdenv.mkDerivation rec { "--disable-stripping" # Disable mmx support for 0.6.90 (verFix null "0.6.90" "--disable-mmx") + ] ++ optionals (stdenv.hostPlatform == stdenv.buildPlatform) [ + "--cross-prefix=${stdenv.cc.targetPrefix}" + "--enable-cross-compile" ] ++ optional stdenv.cc.isClang "--cc=clang"; nativeBuildInputs = [ perl pkgconfig texinfo yasm ]; @@ -168,18 +174,6 @@ stdenv.mkDerivation rec { moveToOutput share/ffmpeg/examples "$doc" ''; - /* Cross-compilation is untested, consider this an outline, more work - needs to be done to portions of the build to get it to work correctly */ - crossAttrs = { - configurePlatforms = []; - configureFlags = configureFlags ++ [ - "--cross-prefix=${stdenv.cc.targetPrefix}" - "--enable-cross-compile" - "--target_os=${hostPlatform.parsed.kernel.name}" - "--arch=${hostPlatform.parsed.cpu.name}" - ]; - }; - installFlags = [ "install-man" ]; passthru = { |