From d086276c1eca07f8cd9dc15604977f51f10e2d6e Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 19 Dec 2015 20:18:02 -0600 Subject: photoqt: Qt 5 infrastructure update --- pkgs/applications/graphics/photoqt/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/graphics/photoqt/default.nix b/pkgs/applications/graphics/photoqt/default.nix index 7ae6d6e050f..c96b0c182a6 100644 --- a/pkgs/applications/graphics/photoqt/default.nix +++ b/pkgs/applications/graphics/photoqt/default.nix @@ -1,11 +1,13 @@ -{ stdenv, fetchurl, cmake, makeWrapper, qt5, exiv2, graphicsmagick }: +{ stdenv, fetchurl, cmake, makeWrapper, exiv2, graphicsmagick +, qtbase, qtdeclarative, qtmultimedia, qtquickcontrols, qttools +}: let version = "1.3"; qmlPath = stdenv.lib.makeSearchPath "lib/qt5/qml/" [ - qt5.quickcontrols - qt5.declarative - qt5.multimedia + qtquickcontrols + qtdeclarative + qtmultimedia ]; in stdenv.mkDerivation rec { @@ -15,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "0j2kvxfb5pd9abciv161nkcsyam6n8kfqs8ymwj2mxiqflwbmfl1"; }; - buildInputs = [ cmake makeWrapper qt5.base qt5.tools exiv2 graphicsmagick ]; + buildInputs = [ cmake makeWrapper qtbase qttools exiv2 graphicsmagick ]; preConfigure = '' export MAGICK_LOCATION="${graphicsmagick}/include/GraphicsMagick" -- cgit 1.4.1