From da346db5de32364465c28f1b5de46fc0e7beb6d9 Mon Sep 17 00:00:00 2001
From: Chris Rendle-Short <chris@killred.net>
Date: Thu, 8 Aug 2019 20:15:50 +1000
Subject: [PATCH] qtpass: use qt5's mkDerivation
See #65399
---
pkgs/applications/misc/qtpass/default.nix | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix
index 15cd426f1b3f..462114ed2721 100644
--- a/pkgs/applications/misc/qtpass/default.nix
+++ b/pkgs/applications/misc/qtpass/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, git, gnupg, pass, qtbase, qtsvg, qttools, qmake, makeWrapper }:
+{ stdenv, mkDerivation, fetchFromGitHub, git, gnupg, pass, qtbase, qtsvg, qttools, qmake, makeWrapper }:
-stdenv.mkDerivation rec {
+mkDerivation rec {
pname = "qtpass";
version = "1.2.3";
@@ -17,13 +17,15 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
+ qtWrapperArgs = [
+ "--suffix PATH : ${git}/bin"
+ "--suffix PATH : ${gnupg}/bin"
+ "--suffix PATH : ${pass}/bin"
+ ];
+
postInstall = ''
install -D qtpass.desktop $out/share/applications/qtpass.desktop
install -D artwork/icon.svg $out/share/icons/hicolor/scalable/apps/qtpass-icon.svg
- wrapProgram $out/bin/qtpass \
- --suffix PATH : ${git}/bin \
- --suffix PATH : ${gnupg}/bin \
- --suffix PATH : ${pass}/bin
'';
meta = with stdenv.lib; {