diff options
author | Profpatsch <mail@profpatsch.de> | 2016-07-03 22:05:13 +0200 |
---|---|---|
committer | Profpatsch <mail@profpatsch.de> | 2016-07-03 22:12:58 +0200 |
commit | 994c81c391be37b7e2cad693dd0b54e2f9b17a30 (patch) | |
tree | 5323da889c160660cd29077a7a56078db5b027b5 /pkgs | |
parent | 0056f5a6d4992d63ed1e16636c63315e62197f51 (diff) | |
download | nixlib-994c81c391be37b7e2cad693dd0b54e2f9b17a30.tar nixlib-994c81c391be37b7e2cad693dd0b54e2f9b17a30.tar.gz nixlib-994c81c391be37b7e2cad693dd0b54e2f9b17a30.tar.bz2 nixlib-994c81c391be37b7e2cad693dd0b54e2f9b17a30.tar.lz nixlib-994c81c391be37b7e2cad693dd0b54e2f9b17a30.tar.xz nixlib-994c81c391be37b7e2cad693dd0b54e2f9b17a30.tar.zst nixlib-994c81c391be37b7e2cad693dd0b54e2f9b17a30.zip |
ffmpeg: additional package fixes
Some KDE packages don’t yet work with ffmpeg-3.
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/desktops/kde-5/applications-16.04/default.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/desktops/kde-5/applications-16.04/default.nix b/pkgs/desktops/kde-5/applications-16.04/default.nix index bb011f091d1a..7acf6593e05d 100644 --- a/pkgs/desktops/kde-5/applications-16.04/default.nix +++ b/pkgs/desktops/kde-5/applications-16.04/default.nix @@ -35,7 +35,9 @@ let baloo-widgets = callPackage ./baloo-widgets.nix {}; dolphin = callPackage ./dolphin.nix {}; dolphin-plugins = callPackage ./dolphin-plugins.nix {}; - ffmpegthumbs = callPackage ./ffmpegthumbs.nix {}; + ffmpegthumbs = callPackage ./ffmpegthumbs.nix { + ffmpeg = pkgs.ffmpeg_2; + }; filelight = callPackage ./filelight.nix {}; gpgmepp = callPackage ./gpgmepp.nix {}; gwenview = callPackage ./gwenview.nix {}; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0d92e2b279c8..540f018d7b88 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8997,6 +8997,7 @@ in vlc = lowPrio (callPackage ../applications/video/vlc { qt4 = null; withQt5 = true; + ffmpeg = ffmpeg_2; }); }; |