diff options
| author | Jörg Thalheim <joerg@thalheim.io> | 2020-01-04 08:26:03 +0000 |
|---|---|---|
| committer | Jörg Thalheim <joerg@thalheim.io> | 2020-01-04 08:26:03 +0000 |
| commit | 1a931f1f60fb14d5bd485f85ee344a570cdcb50c (patch) | |
| tree | 75968a36d1b0c298a3f9f4c6730b5f4efaff66d0 /pkgs/development/libraries/ffmpeg | |
| parent | 7d46f7363cab9df64643eddffd371d654d816919 (diff) | |
| download | nixpkgs-1a931f1f60fb14d5bd485f85ee344a570cdcb50c.tar nixpkgs-1a931f1f60fb14d5bd485f85ee344a570cdcb50c.tar.gz nixpkgs-1a931f1f60fb14d5bd485f85ee344a570cdcb50c.tar.bz2 nixpkgs-1a931f1f60fb14d5bd485f85ee344a570cdcb50c.tar.lz nixpkgs-1a931f1f60fb14d5bd485f85ee344a570cdcb50c.tar.xz nixpkgs-1a931f1f60fb14d5bd485f85ee344a570cdcb50c.tar.zst nixpkgs-1a931f1f60fb14d5bd485f85ee344a570cdcb50c.zip | |
Revert "Revert "ffmpeg: fix cross compilation""
This reverts commit 7d46f7363cab9df64643eddffd371d654d816919. This change was accidentally commit to master. To avoid a mass-rebuild we actually apply this change on staging first.
Diffstat (limited to 'pkgs/development/libraries/ffmpeg')
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/generic.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 956d2d7223f..26a3206d205 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, addOpenGLRunpath, perl, texinfo, yasm +{ stdenv, buildPackages, fetchurl, pkgconfig, addOpenGLRunpath, perl, texinfo, yasm , alsaLib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg , libssh, libtheora, libva, libdrm, libvorbis, libvpx, lzma, libpulseaudio, soxr , x264, x265, xvidcore, zlib, libopus, speex, nv-codec-headers, dav1d @@ -163,8 +163,10 @@ stdenv.mkDerivation rec { ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--cross-prefix=${stdenv.cc.targetPrefix}" "--enable-cross-compile" + "--pkg-config=pkg-config" # Override ffmpeg's ./configure assumption that pkg-config is prefixed by the architecture. (e.g. aarch64-unknown-linux-gnu-pkg-config) ] ++ optional stdenv.cc.isClang "--cc=clang"); + depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ addOpenGLRunpath perl pkgconfig texinfo yasm ]; buildInputs = [ |