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

photoqt: Qt 5 infrastructure update

Browse Source
This commit is contained in:
Thomas Tuegel 2015-12-19 20:18:02 -06:00
parent b829137151
commit d086276c1e
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/graphics/photoqt/default.nix
View File

@ -1,11 +1,13 @@
{ stdenv, fetchurl, cmake, makeWrapper, qt5, exiv2, graphicsmagick }: { stdenv, fetchurl, cmake, makeWrapper, exiv2, graphicsmagick
, qtbase, qtdeclarative, qtmultimedia, qtquickcontrols, qttools
}:
let let
version = "1.3"; version = "1.3";
qmlPath = stdenv.lib.makeSearchPath "lib/qt5/qml/" [ qmlPath = stdenv.lib.makeSearchPath "lib/qt5/qml/" [
qt5.quickcontrols qtquickcontrols
qt5.declarative qtdeclarative
qt5.multimedia qtmultimedia
]; ];
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -15,7 +17,7 @@ stdenv.mkDerivation rec {
sha256 = "0j2kvxfb5pd9abciv161nkcsyam6n8kfqs8ymwj2mxiqflwbmfl1"; sha256 = "0j2kvxfb5pd9abciv161nkcsyam6n8kfqs8ymwj2mxiqflwbmfl1";
}; };
buildInputs = [ cmake makeWrapper qt5.base qt5.tools exiv2 graphicsmagick ]; buildInputs = [ cmake makeWrapper qtbase qttools exiv2 graphicsmagick ];
preConfigure = '' preConfigure = ''
export MAGICK_LOCATION="${graphicsmagick}/include/GraphicsMagick" export MAGICK_LOCATION="${graphicsmagick}/include/GraphicsMagick"

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

@ -12749,7 +12749,7 @@ let
inherit (gst_all_1) gstreamer gst-plugins-base; inherit (gst_all_1) gstreamer gst-plugins-base;
}; };
photoqt = callPackage ../applications/graphics/photoqt { }; photoqt = qt5.callPackage ../applications/graphics/photoqt { };
phototonic = callPackage ../applications/graphics/phototonic { }; phototonic = callPackage ../applications/graphics/phototonic { };