diff options
| author | Daniel Fullmer <danielrf12@gmail.com> | 2020-01-03 20:08:25 -0500 |
|---|---|---|
| committer | Jörg Thalheim <joerg@thalheim.io> | 2020-01-04 08:25:51 +0000 |
| commit | 1b591acf6b4e5d7c26263b64a036a86ee92faf54 (patch) | |
| tree | 75968a36d1b0c298a3f9f4c6730b5f4efaff66d0 /pkgs/development/libraries/ffmpeg | |
| parent | 04000331c10f4fffdb24043a929ee5416e36eda5 (diff) | |
| download | nixpkgs-1b591acf6b4e5d7c26263b64a036a86ee92faf54.tar nixpkgs-1b591acf6b4e5d7c26263b64a036a86ee92faf54.tar.gz nixpkgs-1b591acf6b4e5d7c26263b64a036a86ee92faf54.tar.bz2 nixpkgs-1b591acf6b4e5d7c26263b64a036a86ee92faf54.tar.lz nixpkgs-1b591acf6b4e5d7c26263b64a036a86ee92faf54.tar.xz nixpkgs-1b591acf6b4e5d7c26263b64a036a86ee92faf54.tar.zst nixpkgs-1b591acf6b4e5d7c26263b64a036a86ee92faf54.zip | |
ffmpeg: fix cross compilation
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 = [ |