alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #16682 from Profpatsch/ffmpeg-3

Browse source 
ffmpeg: additional package fixes
This commit is contained in:
Thomas Tuegel 2016-07-03 15:46:03 -05:00 committed by GitHub
parent 3b6dcde064 994c81c391
commit 6eabbb8715
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/desktops/kde-5/applications-16.04/default.nix
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 {};

1
pkgs/top-level/all-packages.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;
}); });
}; };