diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-06-22 10:24:26 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-06-22 10:25:06 +0200 |
| commit | 48f1d9c483c772705b4dca1e02010d339ee0cc53 (patch) | |
| tree | 945eb19c1d7fd6f3c7e773cb52d9b8adec293b74 /pkgs/development | |
| parent | 271443daa1edc05576d4844711c9f8a8e93b6ece (diff) | |
| download | nixlib-48f1d9c483c772705b4dca1e02010d339ee0cc53.tar nixlib-48f1d9c483c772705b4dca1e02010d339ee0cc53.tar.gz nixlib-48f1d9c483c772705b4dca1e02010d339ee0cc53.tar.bz2 nixlib-48f1d9c483c772705b4dca1e02010d339ee0cc53.tar.lz nixlib-48f1d9c483c772705b4dca1e02010d339ee0cc53.tar.xz nixlib-48f1d9c483c772705b4dca1e02010d339ee0cc53.tar.zst nixlib-48f1d9c483c772705b4dca1e02010d339ee0cc53.zip | |
libav: fixup build after e9cce6d
Fixes #16411. The patch wasn't applied anymore.
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/libav/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index acb6eb2c7291..e3aec98a8dbe 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -17,7 +17,7 @@ assert faacSupport -> enableUnfree; -with { inherit (stdenv.lib) optional optionals; }; +with { inherit (stdenv.lib) optional optionals hasPrefix; }; /* ToDo: - more deps, inspiration: http://packages.ubuntu.com/raring/libav-tools @@ -39,8 +39,8 @@ let }; patches = [] - ++ optionals (vpxSupport && version == "0.8.17" ) [ ./vpxenc-0.8.17-libvpx-1.5.patch ] - ++ optionals (vpxSupport && version == "11.6") [ ./vpxenc-11.6-libvpx-1.5.patch ]; + ++ optional (vpxSupport && hasPrefix "0.8." version) ./vpxenc-0.8.17-libvpx-1.5.patch + ++ optional (vpxSupport && hasPrefix "11." version) ./vpxenc-11.6-libvpx-1.5.patch; preConfigure = "patchShebangs doc/texi2pod.pl"; |