diff options
| author | Orivej Desh <orivej@gmx.fr> | 2017-11-16 01:12:18 +0000 |
|---|---|---|
| committer | Orivej Desh <orivej@gmx.fr> | 2017-11-16 01:12:18 +0000 |
| commit | 97800cda51091cb64349329006038d9451909f17 (patch) | |
| tree | 2395792b6047efe582c026966001198bdab35a47 /pkgs/applications/graphics/photoqt | |
| parent | 52c5386cd94aa6681cb7c818638c981d57d5f6a6 (diff) | |
| download | nixpkgs-97800cda51091cb64349329006038d9451909f17.tar nixpkgs-97800cda51091cb64349329006038d9451909f17.tar.gz nixpkgs-97800cda51091cb64349329006038d9451909f17.tar.bz2 nixpkgs-97800cda51091cb64349329006038d9451909f17.tar.lz nixpkgs-97800cda51091cb64349329006038d9451909f17.tar.xz nixpkgs-97800cda51091cb64349329006038d9451909f17.tar.zst nixpkgs-97800cda51091cb64349329006038d9451909f17.zip | |
photoqt: fix build
Diffstat (limited to 'pkgs/applications/graphics/photoqt')
| -rw-r--r-- | pkgs/applications/graphics/photoqt/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/applications/graphics/photoqt/photoqt-1.5.1-qt-5.9.patch | 13 |
2 files changed, 18 insertions, 0 deletions
diff --git a/pkgs/applications/graphics/photoqt/default.nix b/pkgs/applications/graphics/photoqt/default.nix index a3c8d805b23..82e8793199b 100644 --- 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 new file mode 100644 index 00000000000..daa982b5f3a --- /dev/null +++ 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) |