public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Making shotcut use qt5 (5.6), not qt55.

Browse Source
This commit is contained in:
Lluís Batlle i Rossell 2016-08-18 10:21:53 +02:00
parent 0e6822b522
commit b8e215fb50
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/video/shotcut/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, SDL, frei0r, gettext, mlt, jack1, pkgconfig, qtbase, { stdenv, fetchurl, SDL, frei0r, gettext, mlt, jack1, pkgconfig, qtbase,
qtmultimedia, qtwebkit, qtx11extras, qtwebsockets, qtquick1, qtquickcontrols, qtmultimedia, qtwebkit, qtx11extras, qtwebsockets, qtquickcontrols,
qtgraphicaleffects, qtgraphicaleffects,
qmakeHook, makeQtWrapper }: qmakeHook, makeQtWrapper }:
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ SDL frei0r gettext mlt pkgconfig qtbase qtmultimedia qtwebkit buildInputs = [ SDL frei0r gettext mlt pkgconfig qtbase qtmultimedia qtwebkit
qtx11extras qtwebsockets qtquick1 qtquickcontrols qtgraphicaleffects qmakeHook makeQtWrapper ]; qtx11extras qtwebsockets qtquickcontrols qtgraphicaleffects qmakeHook makeQtWrapper ];
enableParallelBuilding = true; enableParallelBuilding = true;

2
pkgs/top-level/all-packages.nix
View File

@ -14078,7 +14078,7 @@ in
stdenv = stdenv_32bit; stdenv = stdenv_32bit;
}; };
shotcut = qt55.callPackage ../applications/video/shotcut { }; shotcut = qt5.callPackage ../applications/video/shotcut { };
smplayer = qt5.callPackage ../applications/video/smplayer { }; smplayer = qt5.callPackage ../applications/video/smplayer { };