diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 3f847bc752f0..6246026e9ea7 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -1,4 +1,5 @@ { stdenv, fetchurl, pkgconfig, perl, texinfo, yasm +, hostPlatform /* * Licensing options (yes some are listed twice, filters and such are not listed) */ @@ -428,30 +429,13 @@ stdenv.mkDerivation rec { /* 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 = let - os = '' - if [ "${stdenv.cross.config}" = "*cygwin*" ] ; then - # Probably should look for mingw too - echo "cygwin" - elif [ "${stdenv.cross.config}" = "*darwin*" ] ; then - echo "darwin" - elif [ "${stdenv.cross.config}" = "*freebsd*" ] ; then - echo "freebsd" - elif [ "${stdenv.cross.config}" = "*linux*" ] ; then - echo "linux" - elif [ "${stdenv.cross.config}" = "*netbsd*" ] ; then - echo "netbsd" - elif [ "${stdenv.cross.config}" = "*openbsd*" ] ; then - echo "openbsd" - fi - ''; - in { + crossAttrs = { configurePlatforms = []; configureFlags = configureFlags ++ [ - "--cross-prefix=${stdenv.cross.config}-" + "--cross-prefix=${stdenv.cc.prefix}" "--enable-cross-compile" - "--target_os=${os}" - "--arch=${stdenv.cross.arch}" + "--target_os=${hostPlatform.parsed.kernel.name}" + "--arch=${hostPlatform.arch}" ]; }; diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 762a4c9503fb..a34b378552a0 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -2,6 +2,7 @@ , alsaLib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg , libtheora, libva, libvorbis, libvpx, lzma, libpulseaudio, soxr , x264, x265, xvidcore, zlib, libopus +, hostPlatform , openglSupport ? false, mesa ? null # Build options , runtimeCpuDetectBuild ? true # Detect CPU capabilities at runtime @@ -169,30 +170,13 @@ stdenv.mkDerivation rec { /* 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 = let - os = '' - if [ "${stdenv.cross.config}" = "*cygwin*" ] ; then - # Probably should look for mingw too - echo "cygwin" - elif [ "${stdenv.cross.config}" = "*darwin*" ] ; then - echo "darwin" - elif [ "${stdenv.cross.config}" = "*freebsd*" ] ; then - echo "freebsd" - elif [ "${stdenv.cross.config}" = "*linux*" ] ; then - echo "linux" - elif [ "${stdenv.cross.config}" = "*netbsd*" ] ; then - echo "netbsd" - elif [ "${stdenv.cross.config}" = "*openbsd*" ] ; then - echo "openbsd" - fi - ''; - in { + crossAttrs = { configurePlatforms = []; configureFlags = configureFlags ++ [ - "--cross-prefix=${stdenv.cross.config}-" + "--cross-prefix=${stdenv.cc.prefix}" "--enable-cross-compile" - "--target_os=${os}" - "--arch=${stdenv.cross.arch}" + "--target_os=${hostPlatform.parsed.kernel}" + "--arch=${hostPlatform.arch}" ]; };