Merge pull request #9761 from eduarrrd/photoqt

Photoqt bump

pkgs/applications/graphics/graphicsmagick/default.nix

···
 , libjpeg, libpng, libtiff, libxml2, zlib, libtool, xz
 , libX11, quantumdepth ? 8}:
 
-let version = "1.3.18"; in
+let version = "1.3.21"; in
 
 stdenv.mkDerivation {
   name = "graphicsmagick-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz";
-    sha256 = "1axh4j2jr3l92dan15b2nmx9da4l7i0rcz9b5bvfd4q742zfwj7x";
+    sha256 = "07rwpxy62r9m4r2cg6yll2nr698mxyvbji8vgsivcxhpk56k0ich";
   };
 
   configureFlags = "--enable-shared --with-quantum-depth=" + toString quantumdepth;

pkgs/applications/graphics/photoqt/default.nix

···
-{ stdenv, fetchurl, cmake, qt5, exiv2, graphicsmagick }:
+{ stdenv, fetchurl, cmake, makeWrapper, qt5, exiv2, graphicsmagick }:
 
 let
-  version = "1.2";
+  version = "1.3";
+  qmlPath = stdenv.lib.makeSearchPath "lib/qt5/qml/" [
+    qt5.quickcontrols
+    qt5.declarative
+    qt5.multimedia
+  ];
 in
 stdenv.mkDerivation rec {
   name = "photoqt-${version}";
   src = fetchurl {
     url = "http://photoqt.org/pkgs/photoqt-${version}.tar.gz";
-    sha256 = "1dnnj2h3j517hcbjxlzk035fis44wdmqq7dvhwpmq1rcr0v32aaa";
+    sha256 = "0j2kvxfb5pd9abciv161nkcsyam6n8kfqs8ymwj2mxiqflwbmfl1";
   };
 
-  buildInputs = [ cmake qt5.base qt5.tools exiv2 graphicsmagick ];
+  buildInputs = [ cmake makeWrapper qt5.base qt5.tools exiv2 graphicsmagick ];
 
   preConfigure = ''
     export MAGICK_LOCATION="${graphicsmagick}/include/GraphicsMagick"
+  '';
+
+  postInstall = ''
+    wrapProgram $out/bin/photoqt --set QML2_IMPORT_PATH "${qmlPath}"
   '';
 
   meta = {