diff options
| author | Jörg Thalheim <joerg@thalheim.io> | 2020-01-04 08:24:30 +0000 |
|---|---|---|
| committer | Jörg Thalheim <joerg@thalheim.io> | 2020-01-04 08:25:54 +0000 |
| commit | 7d46f7363cab9df64643eddffd371d654d816919 (patch) | |
| tree | 2772124fdb5e4d961dd6be5ee0d498e5e54a6b64 /pkgs/development/libraries/ffmpeg | |
| parent | 1b591acf6b4e5d7c26263b64a036a86ee92faf54 (diff) | |
| download | nixpkgs-7d46f7363cab9df64643eddffd371d654d816919.tar nixpkgs-7d46f7363cab9df64643eddffd371d654d816919.tar.gz nixpkgs-7d46f7363cab9df64643eddffd371d654d816919.tar.bz2 nixpkgs-7d46f7363cab9df64643eddffd371d654d816919.tar.lz nixpkgs-7d46f7363cab9df64643eddffd371d654d816919.tar.xz nixpkgs-7d46f7363cab9df64643eddffd371d654d816919.tar.zst nixpkgs-7d46f7363cab9df64643eddffd371d654d816919.zip | |
Revert "ffmpeg: fix cross compilation"
This reverts commit f6f8f0b75a40da0ab572ecdf891f4394b44c3783. avoid mass-rebuild on master; move to staging instead.
Diffstat (limited to 'pkgs/development/libraries/ffmpeg')
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/generic.nix | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 26a3206d205..956d2d7223f 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages, fetchurl, pkgconfig, addOpenGLRunpath, perl, texinfo, yasm +{ stdenv, 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,10 +163,8 @@ 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 = [ |