3
0
Fork 0
forked from mirrors/nixpkgs

ffmpeg: additional package fixes

Some KDE packages don’t yet work with ffmpeg-3.
This commit is contained in:
Profpatsch 2016-07-03 22:05:13 +02:00
parent 0056f5a6d4
commit 994c81c391
2 changed files with 4 additions and 1 deletions

View file

@ -35,7 +35,9 @@ let
baloo-widgets = callPackage ./baloo-widgets.nix {}; baloo-widgets = callPackage ./baloo-widgets.nix {};
dolphin = callPackage ./dolphin.nix {}; dolphin = callPackage ./dolphin.nix {};
dolphin-plugins = callPackage ./dolphin-plugins.nix {}; dolphin-plugins = callPackage ./dolphin-plugins.nix {};
ffmpegthumbs = callPackage ./ffmpegthumbs.nix {}; ffmpegthumbs = callPackage ./ffmpegthumbs.nix {
ffmpeg = pkgs.ffmpeg_2;
};
filelight = callPackage ./filelight.nix {}; filelight = callPackage ./filelight.nix {};
gpgmepp = callPackage ./gpgmepp.nix {}; gpgmepp = callPackage ./gpgmepp.nix {};
gwenview = callPackage ./gwenview.nix {}; gwenview = callPackage ./gwenview.nix {};

View file

@ -8997,6 +8997,7 @@ in
vlc = lowPrio (callPackage ../applications/video/vlc { vlc = lowPrio (callPackage ../applications/video/vlc {
qt4 = null; qt4 = null;
withQt5 = true; withQt5 = true;
ffmpeg = ffmpeg_2;
}); });
}; };