diff options
author | K900 <me@0upti.me> | 2023-03-12 16:11:06 +0300 |
---|---|---|
committer | K900 <me@0upti.me> | 2023-03-12 16:27:09 +0300 |
commit | 61c8a0f6bc86788e4d1ccbbcc82a245f4c78d307 (patch) | |
tree | bb46c20ac2288243742ab905b0469ec2308eedcd | |
parent | b0cdb866af6f9189fd26946aa188fa6cefe93426 (diff) |
photoqt: 1.7.1 -> 3.1
Fix build
-rw-r--r-- | pkgs/applications/graphics/photoqt/default.nix | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/pkgs/applications/graphics/photoqt/default.nix b/pkgs/applications/graphics/photoqt/default.nix index 767b749ef736c..3b17ce8fd4f87 100644 --- a/pkgs/applications/graphics/photoqt/default.nix +++ b/pkgs/applications/graphics/photoqt/default.nix @@ -1,35 +1,28 @@ -{ mkDerivation, lib, fetchurl, cmake, exiv2, graphicsmagick, libraw, fetchpatch -, qtbase, qtdeclarative, qtmultimedia, qtquickcontrols, qttools, qtgraphicaleffects -, extra-cmake-modules, poppler, kimageformats, libarchive}: +{ mkDerivation, lib, fetchurl, cmake, exiv2, graphicsmagick, libraw +, qtbase, qtdeclarative, qtmultimedia, qtquickcontrols2, qttools, qtgraphicaleffects +, extra-cmake-modules, poppler, kimageformats, libarchive, pugixml, wrapQtAppsHook}: mkDerivation rec { pname = "photoqt"; - version = "1.7.1"; + version = "3.1"; src = fetchurl { url = "https://${pname}.org/pkgs/${pname}-${version}.tar.gz"; - sha256 = "1qvxdh3cbjcywqx0da2qp8z092660qyzv5yknqbps2zr12qqb103"; + hash = "sha256-hihfqE7XIlSAxPg3Kzld3LrYS97wDH//GGqpBpBwFm0="; }; - patches = [ - # Fixes build with exiv2 0.27.1 - (fetchpatch { - url = "https://gitlab.com/luspi/photoqt/commit/c6fd41478e818f3a651d40f96cab3d790e1c09a4.patch"; - sha256 = "1j2pdr7hm3js7lswhb4qkf9sj9viclhjqz50qxpyd7pqrl1gf2va"; - }) - ]; - - nativeBuildInputs = [ cmake extra-cmake-modules qttools ]; + nativeBuildInputs = [ cmake extra-cmake-modules qttools wrapQtAppsHook ]; buildInputs = [ - qtbase qtquickcontrols exiv2 graphicsmagick poppler + qtbase qtquickcontrols2 exiv2 graphicsmagick poppler qtmultimedia qtdeclarative libraw qtgraphicaleffects - kimageformats libarchive + kimageformats libarchive pugixml ]; cmakeFlags = [ "-DFREEIMAGE=OFF" "-DDEVIL=OFF" + "-DCHROMECAST=OFF" ]; preConfigure = '' |