diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2015-12-19 20:18:02 -0600 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2015-12-20 07:56:44 -0600 |
| commit | d086276c1eca07f8cd9dc15604977f51f10e2d6e (patch) | |
| tree | 1114b8b7b900cc37157330bb5030bc5b0415fd06 /pkgs/applications/graphics/photoqt | |
| parent | b829137151239298a1fa5c72145a584ec7dc9d5d (diff) | |
| download | nixpkgs-d086276c1eca07f8cd9dc15604977f51f10e2d6e.tar nixpkgs-d086276c1eca07f8cd9dc15604977f51f10e2d6e.tar.gz nixpkgs-d086276c1eca07f8cd9dc15604977f51f10e2d6e.tar.bz2 nixpkgs-d086276c1eca07f8cd9dc15604977f51f10e2d6e.tar.lz nixpkgs-d086276c1eca07f8cd9dc15604977f51f10e2d6e.tar.xz nixpkgs-d086276c1eca07f8cd9dc15604977f51f10e2d6e.tar.zst nixpkgs-d086276c1eca07f8cd9dc15604977f51f10e2d6e.zip | |
photoqt: Qt 5 infrastructure update
Diffstat (limited to 'pkgs/applications/graphics/photoqt')
| -rw-r--r-- | pkgs/applications/graphics/photoqt/default.nix | 12 |
1 files changed, 7 insertions, 5 deletions
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" |