From 48f1d9c483c772705b4dca1e02010d339ee0cc53 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Wed, 22 Jun 2016 10:24:26 +0200 Subject: libav: fixup build after e9cce6d Fixes #16411. The patch wasn't applied anymore. --- pkgs/development/libraries/libav/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/development') 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"; -- cgit 1.4.1