photoqt: fix build

NixOS · Nov 16, 2017 · 97800cd · 97800cd
1 parent 52c5386
commit 97800cd
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/pkgs/applications/graphics/photoqt/default.nix b/pkgs/applications/graphics/photoqt/default.nix
@@ -11,7 +11,10 @@ stdenv.mkDerivation rec {
     sha256 = "17kkpzkmzfnigs26jjyd75iy58qffjsclif81cmviq73lzmqy0b1";
   };
 
+  patches = [ ./photoqt-1.5.1-qt-5.9.patch ];
+
   nativeBuildInputs = [ cmake ];
+
   buildInputs = [
     qtbase qtquickcontrols qttools exiv2 graphicsmagick
     qtmultimedia qtdeclarative libraw qtgraphicaleffects
@@ -21,6 +24,8 @@ stdenv.mkDerivation rec {
     export MAGICK_LOCATION="${graphicsmagick}/include/GraphicsMagick"
   '';
 
+  enableParallelBuilding = true;
+
   meta = {
     homepage = http://photoqt.org/;
     description = "Simple, yet powerful and good looking image viewer";

diff --git a/pkgs/applications/graphics/photoqt/photoqt-1.5.1-qt-5.9.patch b/pkgs/applications/graphics/photoqt/photoqt-1.5.1-qt-5.9.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 97abcb5..fd4877a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -50,7 +50,7 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O3 -Wall")
+ #### FIND REQUIRED PACKAGES ####
+ ################################
+
+-FIND_PACKAGE(Qt5 COMPONENTS LinguistTools Quick Widgets Core Svg REQUIRED)
++FIND_PACKAGE(Qt5 COMPONENTS LinguistTools Quick Widgets Core Svg Sql Xml REQUIRED)
+ SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMake" ${CMAKE_MODULE_PATH})
+ FIND_PACKAGE(Magick)
+ FIND_PACKAGE(Exiv2)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -16113,7 +16113,7 @@ with pkgs;
 
   pflask = callPackage ../os-specific/linux/pflask {};
 
-  photoqt = libsForQt56.callPackage ../applications/graphics/photoqt { };
+  photoqt = libsForQt5.callPackage ../applications/graphics/photoqt { };
 
   phototonic = libsForQt5.callPackage ../applications/graphics/phototonic { };