qt5: remove makeQtWrapper

2017-06-18 08:44:42 -05:00
parent 1607f51613
commit c816bbc8a8
92 changed files with 323 additions and 582 deletions
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, makeQtWrapper, exiv2, graphicsmagick
+{ stdenv, fetchurl, cmake, exiv2, graphicsmagick
 , qtbase, qtdeclarative, qtmultimedia, qtquickcontrols, qttools
 }:

@@ -12,8 +12,9 @@ stdenv.mkDerivation rec {
    sha256 = "0j2kvxfb5pd9abciv161nkcsyam6n8kfqs8ymwj2mxiqflwbmfl1";
  };

+  nativeBuildInputs = [ cmake ];
  buildInputs = [
-    cmake makeQtWrapper qtbase qtquickcontrols qttools exiv2 graphicsmagick
+    qtbase qtquickcontrols qttools exiv2 graphicsmagick
    qtmultimedia qtdeclarative
  ];

@@ -21,10 +22,6 @@ stdenv.mkDerivation rec {
    export MAGICK_LOCATION="${graphicsmagick}/include/GraphicsMagick"
  '';

-  postInstall = ''
-    wrapQtProgram $out/bin/photoqt
-  '';
-
  meta = {
    homepage = "http://photoqt.org/";
    description = "Simple, yet powerful and good looking image viewer";