Merge pull request #66318 from lightbulbjim/qtpass-wrapping
qtpass: use qt5's mkDerivation
This commit is contained in:
commit
8e598118cd
@ -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";
|
pname = "qtpass";
|
||||||
version = "1.2.3";
|
version = "1.2.3";
|
||||||
|
|
||||||
@ -17,13 +17,15 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
qtWrapperArgs = [
|
||||||
|
"--suffix PATH : ${git}/bin"
|
||||||
|
"--suffix PATH : ${gnupg}/bin"
|
||||||
|
"--suffix PATH : ${pass}/bin"
|
||||||
|
];
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
install -D qtpass.desktop $out/share/applications/qtpass.desktop
|
install -D qtpass.desktop $out/share/applications/qtpass.desktop
|
||||||
install -D artwork/icon.svg $out/share/icons/hicolor/scalable/apps/qtpass-icon.svg
|
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; {
|
meta = with stdenv.lib; {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user