Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 04000331c10f
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1a931f1f60fb
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 4, 2020

  1. ffmpeg: fix cross compilation

    @danielfullmer @Mic92
    danielfullmer authored and Mic92 committed Jan 4, 2020
    Copy the full SHA
    1b591ac View commit details

  2. Revert "ffmpeg: fix cross compilation" 

    This reverts commit f6f8f0b.

avoid mass-rebuild on master; move to staging instead.
    @Mic92
    Mic92 committed Jan 4, 2020
    Copy the full SHA
    7d46f73 View commit details

  3. Revert "Revert "ffmpeg: fix cross compilation"" 

    This reverts commit 7d46f73.

This change was accidentally commit to master. To avoid a mass-rebuild we
actually apply this change on staging first.
    @Mic92
    Mic92 committed Jan 4, 2020
    Copy the full SHA
    1a931f1 View commit details
Showing with 3 additions and 1 deletion.
  1. +3 −1 pkgs/development/libraries/ffmpeg/generic.nix
4 changes: 3 additions & 1 deletion pkgs/development/libraries/ffmpeg/generic.nix
View file
Original file line number Diff line number Diff line change
@@ -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 = [