diff options
| author | John Ericson <Ericson2314@yahoo.com> | 2018-05-10 02:17:34 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-10 02:17:34 -0400 |
| commit | 7d8e16d93905b95975daf09945621eb75051e30d (patch) | |
| tree | 8bc35a103ce60e19043b581ec2e54ac01aaa91f5 /pkgs/development/libraries/ffmpeg | |
| parent | 006422d08d7f0576d745baa23328e951e0f7b4c2 (diff) | |
| parent | 7864a17bfb1fce9195e024e1e2ff1dfa14a942f3 (diff) | |
| download | nixlib-7d8e16d93905b95975daf09945621eb75051e30d.tar nixlib-7d8e16d93905b95975daf09945621eb75051e30d.tar.gz nixlib-7d8e16d93905b95975daf09945621eb75051e30d.tar.bz2 nixlib-7d8e16d93905b95975daf09945621eb75051e30d.tar.lz nixlib-7d8e16d93905b95975daf09945621eb75051e30d.tar.xz nixlib-7d8e16d93905b95975daf09945621eb75051e30d.tar.zst nixlib-7d8e16d93905b95975daf09945621eb75051e30d.zip | |
Merge pull request #40275 from obsidiansystems/fewer-crossAttrs
fontconfig, misc A/V packages: No crossAttrs
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 0883e5dfd500..e807a5148901 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 ]; @@ -169,18 +175,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 = { |