nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 23:43:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

pass: update from 1.6.3 to 1.6.5

Browse Source
This commit is contained in:
Moritz Ulrich 2015-02-07 18:45:56 +01:00
parent 1bbf15eca1
commit 6a24650cb5
2 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/tools/security/pass/darwin-getopt.patch
View File

@ -1,11 +0,0 @@
diff --git a/src/platform/darwin.sh b/src/platform/darwin.sh
index 1b76c33..fa40104 100644
--- a/src/platform/darwin.sh
+++ b/src/platform/darwin.sh
@@ -31,5 +31,5 @@ tmpdir() {
mount -t hfs -o noatime -o nobrowse "$ramdisk_dev" "$SECURE_TMPDIR" || exit 1
}
-GETOPT="$(brew --prefix gnu-getopt 2>/dev/null || echo /usr/local)/bin/getopt"
+GETOPT="getopt"
SHRED="srm -f -z"

11
pkgs/tools/security/pass/default.nix
View File

@ -1,23 +1,22 @@
{ stdenv, fetchurl
, coreutils, gnused, getopt, pwgen, git, tree, gnupg
, makeWrapper
, withX ? true, xclip ? null, xdotool ? null
, withX ? true, xclip, xdotool, dmenu
}:
assert withX -> xclip != null;
assert withX -> xdotool != null;
assert withX -> dmenu != null;
stdenv.mkDerivation rec {
version = "1.6.3";
version = "1.6.5";
name = "password-store-${version}";
src = fetchurl {
url = "http://git.zx2c4.com/password-store/snapshot/${name}.tar.xz";
sha256 = "1xs00c7ffqd0093i452kryw9sjip6dkp1pclx69zihb5l45d86fl";
sha256 = "05bk3lrp5jwg0v338lvylp7glpliydzz4jf5pjr6k3kagrv3jyik";
};
patches = [ ./darwin-getopt.patch ];
buildInputs = [ makeWrapper ];
meta = with stdenv.lib; {
@ -65,7 +64,7 @@ stdenv.mkDerivation rec {
${if withX then ''
wrapProgram $out/bin/passmenu \
--prefix PATH : "$out/bin:${xdotool}/bin"
--prefix PATH : "$out/bin:${xdotool}/bin:${dmenu}/bin"
'' else ""}
'';
}