diff options
| author | Daniel Fullmer <danielrf12@gmail.com> | 2020-01-03 20:08:25 -0500 |
|---|---|---|
| committer | Daniel Fullmer <danielrf12@gmail.com> | 2020-01-04 02:14:53 -0500 |
| commit | f6f8f0b75a40da0ab572ecdf891f4394b44c3783 (patch) | |
| tree | a2dfd2b8a977bf7f25cce5a5b15ce1b60cc971cf /pkgs/development/libraries/ffmpeg | |
| parent | bd62dd3bb37a5d9686a92e4be8a36d2e13637b2b (diff) | |
| download | nixpkgs-f6f8f0b75a40da0ab572ecdf891f4394b44c3783.tar nixpkgs-f6f8f0b75a40da0ab572ecdf891f4394b44c3783.tar.gz nixpkgs-f6f8f0b75a40da0ab572ecdf891f4394b44c3783.tar.bz2 nixpkgs-f6f8f0b75a40da0ab572ecdf891f4394b44c3783.tar.lz nixpkgs-f6f8f0b75a40da0ab572ecdf891f4394b44c3783.tar.xz nixpkgs-f6f8f0b75a40da0ab572ecdf891f4394b44c3783.tar.zst nixpkgs-f6f8f0b75a40da0ab572ecdf891f4394b44c3783.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 = [ |