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: 1383c08f2c08
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 56621c016d54
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Oct 2, 2018

  1. ffmpeg: unbreak build of older versions after #46078 

    As in the other cases, I didn't care about passing the dependency
if unused...
    @vcunat
    vcunat committed Oct 2, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    zimbatm Jonas Chevalier
    GPG key ID: 71BAF6D40C1D63D7
    Verified
    Learn about vigilant mode
    Copy the full SHA
    56621c0 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 pkgs/development/libraries/ffmpeg/generic.nix
2 changes: 1 addition & 1 deletion pkgs/development/libraries/ffmpeg/generic.nix
View file
Original file line number Diff line number Diff line change
@@ -128,7 +128,7 @@ stdenv.mkDerivation rec {
"--enable-libmp3lame"
(ifMinVer "1.2" "--enable-iconv")
"--enable-libtheora"
"--enable-libssh"
(ifMinVer "2.1" "--enable-libssh")
(ifMinVer "0.6" (enableFeature vaapiSupport "vaapi"))
"--enable-vdpau"
"--enable-libvorbis"