diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-06-27 02:18:46 -0400 |
|---|---|---|
| committer | worldofpeace <worldofpeace@protonmail.ch> | 2019-06-27 03:18:06 -0400 |
| commit | 38be980e5d2e8bfca9b9070e29995c479f6c248f (patch) | |
| tree | b83e06932553acec1cd6f0284fbd1f9f9d71bf25 /pkgs/applications/graphics/photoqt | |
| parent | e186ad5c31739f69d083412dbf22d5e9959f9a6d (diff) | |
| download | nixpkgs-38be980e5d2e8bfca9b9070e29995c479f6c248f.tar nixpkgs-38be980e5d2e8bfca9b9070e29995c479f6c248f.tar.gz nixpkgs-38be980e5d2e8bfca9b9070e29995c479f6c248f.tar.bz2 nixpkgs-38be980e5d2e8bfca9b9070e29995c479f6c248f.tar.lz nixpkgs-38be980e5d2e8bfca9b9070e29995c479f6c248f.tar.xz nixpkgs-38be980e5d2e8bfca9b9070e29995c479f6c248f.tar.zst nixpkgs-38be980e5d2e8bfca9b9070e29995c479f6c248f.zip | |
photoqt: 1.5.1 -> 1.7.1
Also pull in patch upstream to fix build with exiv2 0.27.1.
Diffstat (limited to 'pkgs/applications/graphics/photoqt')
| -rw-r--r-- | pkgs/applications/graphics/photoqt/default.nix | 29 | ||||
| -rw-r--r-- | pkgs/applications/graphics/photoqt/photoqt-1.5.1-qt-5.9.patch | 13 |
2 files changed, 21 insertions, 21 deletions
diff --git a/pkgs/applications/graphics/photoqt/default.nix b/pkgs/applications/graphics/photoqt/default.nix index 7571bb29bec..68afdd8694b 100644 --- a/pkgs/applications/graphics/photoqt/default.nix +++ b/pkgs/applications/graphics/photoqt/default.nix @@ -1,23 +1,36 @@ -{ stdenv, fetchurl, cmake, exiv2, graphicsmagick, libraw +{ stdenv, fetchurl, cmake, exiv2, graphicsmagick, libraw, fetchpatch , qtbase, qtdeclarative, qtmultimedia, qtquickcontrols, qttools, qtgraphicaleffects +, extra-cmake-modules, poppler, kimageformats, libarchive, libdevil }: stdenv.mkDerivation rec { - name = "photoqt-${version}"; - version = "1.5.1"; + pname = "photoqt"; + version = "1.7.1"; src = fetchurl { - url = "https://photoqt.org/pkgs/photoqt-${version}.tar.gz"; - sha256 = "17kkpzkmzfnigs26jjyd75iy58qffjsclif81cmviq73lzmqy0b1"; + url = "https://${pname}.org/pkgs/${pname}-${version}.tar.gz"; + sha256 = "1qvxdh3cbjcywqx0da2qp8z092660qyzv5yknqbps2zr12qqb103"; }; - patches = [ ./photoqt-1.5.1-qt-5.9.patch ]; + patches = [ + # Fixes build with exiv2 0.27.1 + (fetchpatch { + url = "https://gitlab.com/luspi/photoqt/commit/c6fd41478e818f3a651d40f96cab3d790e1c09a4.patch"; + sha256 = "1j2pdr7hm3js7lswhb4qkf9sj9viclhjqz50qxpyd7pqrl1gf2va"; + }) + ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake extra-cmake-modules qttools ]; buildInputs = [ - qtbase qtquickcontrols qttools exiv2 graphicsmagick + qtbase qtquickcontrols exiv2 graphicsmagick poppler qtmultimedia qtdeclarative libraw qtgraphicaleffects + kimageformats libarchive + ]; + + cmakeFlags = [ + "-DFREEIMAGE=OFF" + "-DDEVIL=OFF" ]; preConfigure = '' 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 deleted file mode 100644 index daa982b5f3a..00000000000 --- a/pkgs/applications/graphics/photoqt/photoqt-1.5.1-qt-5.9.patch +++ /dev/null @@ -1,13 +0,0 @@ -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) |