From 3895a0b7dd7886f7ad8e1a339f6e18e58334c011 Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Mon, 25 Apr 2016 12:12:05 +0200
Subject: [PATCH] qtpass: 1.1.0 -> 1.1.1

Updates qtpass and fixes the current installation method. It further installs
the desktop file and application icon.
---
 pkgs/applications/misc/qtpass/default.nix | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix
index 15f249ac906..342a03f8984 100644
--- a/pkgs/applications/misc/qtpass/default.nix
+++ b/pkgs/applications/misc/qtpass/default.nix
@@ -1,15 +1,17 @@
-{ stdenv, fetchurl, git, gnupg, makeQtWrapper, pass, qtbase, qtsvg, qttools, qmakeHook }:
+{ stdenv, fetchzip, git, gnupg, makeQtWrapper, pass, qtbase, qtsvg, qttools, qmakeHook }:
 
 stdenv.mkDerivation rec {
   name = "qtpass-${version}";
-  version = "1.1.0";
+  version = "1.1.1";
 
-  src = fetchurl {
+  src = fetchzip {
     url = "https://github.com/IJHack/qtpass/archive/v${version}.tar.gz";
-    sha256 = "60b458062f54184057e55dbd9c93958a8bf845244ffd70b9cb31bf58697f0dc6";
+    sha256 = "1x1ic9as0a60gz664sf8d1qiq64ji7q60g19x0rlm3bvcp2612c8";
   };
 
-  buildInputs = [ git gnupg makeQtWrapper pass qtbase qtsvg qttools qmakeHook ];
+  buildInputs = [ git gnupg pass qtbase qtsvg qttools ];
+
+  nativeBuildInputs = [ makeQtWrapper qmakeHook ];
 
   preConfigure = ''
     qmakeFlags="$qmakeFlags CONFIG+=release DESTDIR=$out"
@@ -18,9 +20,12 @@ stdenv.mkDerivation rec {
   installPhase = ''
     mkdir $out/bin
     mv $out/qtpass $out/bin
+    install -D {,$out/share/applications/}qtpass.desktop
+    install -D artwork/icon.svg $out/share/icons/hicolor/scalable/apps/qtpass-icon.svg
+    runHook postInstall
   '';
 
-  postFixup = ''
+  postInstall = ''
     wrapQtProgram $out/bin/qtpass \
       --suffix PATH : ${git}/bin \
       --suffix PATH : ${gnupg}/bin \
@@ -29,7 +34,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A multi-platform GUI for pass, the standard unix password manager";
-    homepage = https://github.com/IJHack/qtpass;
+    homepage = https://qtpass.org;
     license = licenses.gpl3;
     maintainers = [ maintainers.hrdinka ];
     platforms = platforms.all;