photoqt: fix build
This commit is contained in:
parent
52c5386cd9
commit
97800cda51
@ -11,7 +11,10 @@ stdenv.mkDerivation rec {
|
|||||||
sha256 = "17kkpzkmzfnigs26jjyd75iy58qffjsclif81cmviq73lzmqy0b1";
|
sha256 = "17kkpzkmzfnigs26jjyd75iy58qffjsclif81cmviq73lzmqy0b1";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [ ./photoqt-1.5.1-qt-5.9.patch ];
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake ];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
qtbase qtquickcontrols qttools exiv2 graphicsmagick
|
qtbase qtquickcontrols qttools exiv2 graphicsmagick
|
||||||
qtmultimedia qtdeclarative libraw qtgraphicaleffects
|
qtmultimedia qtdeclarative libraw qtgraphicaleffects
|
||||||
@ -21,6 +24,8 @@ stdenv.mkDerivation rec {
|
|||||||
export MAGICK_LOCATION="${graphicsmagick}/include/GraphicsMagick"
|
export MAGICK_LOCATION="${graphicsmagick}/include/GraphicsMagick"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = http://photoqt.org/;
|
homepage = http://photoqt.org/;
|
||||||
description = "Simple, yet powerful and good looking image viewer";
|
description = "Simple, yet powerful and good looking image viewer";
|
||||||
|
@ -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)
|
@ -16113,7 +16113,7 @@ with pkgs;
|
|||||||
|
|
||||||
pflask = callPackage ../os-specific/linux/pflask {};
|
pflask = callPackage ../os-specific/linux/pflask {};
|
||||||
|
|
||||||
photoqt = libsForQt56.callPackage ../applications/graphics/photoqt { };
|
photoqt = libsForQt5.callPackage ../applications/graphics/photoqt { };
|
||||||
|
|
||||||
phototonic = libsForQt5.callPackage ../applications/graphics/phototonic { };
|
phototonic = libsForQt5.callPackage ../applications/graphics/phototonic { };
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user