From d2fec0a9220eb76e9fb586229f1606ca347a4122 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 13 Apr 2016 15:38:25 +0300
Subject: photoqt: use wrapQtProgram

---
 pkgs/applications/graphics/photoqt/default.nix | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'pkgs/applications/graphics/photoqt')

diff --git a/pkgs/applications/graphics/photoqt/default.nix b/pkgs/applications/graphics/photoqt/default.nix
index 9d68a44821a..f9b24581929 100644
--- a/pkgs/applications/graphics/photoqt/default.nix
+++ b/pkgs/applications/graphics/photoqt/default.nix
@@ -1,14 +1,9 @@
-{ stdenv, fetchurl, cmake, makeWrapper, exiv2, graphicsmagick
+{ stdenv, fetchurl, cmake, makeQtWrapper, exiv2, graphicsmagick
 , qtbase, qtdeclarative, qtmultimedia, qtquickcontrols, qttools
 }:
 
 let
   version = "1.3";
-  qmlPath = stdenv.lib.makeSearchPath "lib/qt5/qml/" [
-    qtquickcontrols
-    qtdeclarative
-    qtmultimedia
-  ];
 in
 stdenv.mkDerivation rec {
   name = "photoqt-${version}";
@@ -18,7 +13,8 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    cmake makeWrapper qtbase qtquickcontrols qttools exiv2 graphicsmagick
+    cmake makeQtWrapper qtbase qtquickcontrols qttools exiv2 graphicsmagick
+    qtmultimedia qtdeclarative
   ];
 
   preConfigure = ''
@@ -26,7 +22,7 @@ stdenv.mkDerivation rec {
   '';
 
   postInstall = ''
-    wrapProgram $out/bin/photoqt --set QML2_IMPORT_PATH "${qmlPath}"
+    wrapQtProgram $out/bin/photoqt
   '';
 
   meta = {
-- 
cgit 1.4.1