public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libav: fixup build after e9cce6d

Browse Source 
Fixes #16411. The patch wasn't applied anymore.
This commit is contained in:
Vladimír Čunát 2016-06-22 10:24:26 +02:00
parent 271443daa1
commit 48f1d9c483
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/libav/default.nix
View File

@ -17,7 +17,7 @@
assert faacSupport -> enableUnfree; assert faacSupport -> enableUnfree;
with { inherit (stdenv.lib) optional optionals; }; with { inherit (stdenv.lib) optional optionals hasPrefix; };
/* ToDo: /* ToDo:
- more deps, inspiration: http://packages.ubuntu.com/raring/libav-tools - more deps, inspiration: http://packages.ubuntu.com/raring/libav-tools
@ -39,8 +39,8 @@ let
}; };
patches = [] patches = []
++ optionals (vpxSupport && version == "0.8.17" ) [ ./vpxenc-0.8.17-libvpx-1.5.patch ] ++ optional (vpxSupport && hasPrefix "0.8." version) ./vpxenc-0.8.17-libvpx-1.5.patch
++ optionals (vpxSupport && version == "11.6") [ ./vpxenc-11.6-libvpx-1.5.patch ]; ++ optional (vpxSupport && hasPrefix "11." version) ./vpxenc-11.6-libvpx-1.5.patch;
preConfigure = "patchShebangs doc/texi2pod.pl"; preConfigure = "patchShebangs doc/texi2pod.pl";