diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2016-01-30 15:55:58 +0100 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2016-01-30 15:55:58 +0100 |
| commit | 90b457336fd15555fcf849ee34aff2b2f80d4fab (patch) | |
| tree | 6ca4fd83f2b7dd0df6928ed820afe0dc0ba55453 /pkgs/tools/security | |
| parent | bfded63cf83aa0f316b092ce6777f48405177367 (diff) | |
| parent | 53f7baa6b8cfcf4812fb2182fa7864c780d10dcf (diff) | |
| download | nixlib-90b457336fd15555fcf849ee34aff2b2f80d4fab.tar nixlib-90b457336fd15555fcf849ee34aff2b2f80d4fab.tar.gz nixlib-90b457336fd15555fcf849ee34aff2b2f80d4fab.tar.bz2 nixlib-90b457336fd15555fcf849ee34aff2b2f80d4fab.tar.lz nixlib-90b457336fd15555fcf849ee34aff2b2f80d4fab.tar.xz nixlib-90b457336fd15555fcf849ee34aff2b2f80d4fab.tar.zst nixlib-90b457336fd15555fcf849ee34aff2b2f80d4fab.zip | |
Merge pull request #12675 from zimbatm/pass-fix
pass: fixes .wrapped-pass in usage
Diffstat (limited to 'pkgs/tools/security')
| -rw-r--r-- | pkgs/tools/security/pass/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/security/pass/program-name.patch | 13 |
2 files changed, 16 insertions, 1 deletions
diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix index 03720d6abe1a..56e20726793d 100644 --- a/pkgs/tools/security/pass/default.nix +++ b/pkgs/tools/security/pass/default.nix @@ -19,7 +19,9 @@ stdenv.mkDerivation rec { sha256 = "05bk3lrp5jwg0v338lvylp7glpliydzz4jf5pjr6k3kagrv3jyik"; }; - patches = if stdenv.isDarwin then [ ./no-darwin-getopt.patch ] else null; + patches = + [ ./program-name.patch ] ++ + stdenv.lib.optional stdenv.isDarwin ./no-darwin-getopt.patch; buildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/pass/program-name.patch b/pkgs/tools/security/pass/program-name.patch new file mode 100644 index 000000000000..db01942f638d --- /dev/null +++ b/pkgs/tools/security/pass/program-name.patch @@ -0,0 +1,13 @@ +diff --git a/src/password-store.sh b/src/password-store.sh +index 6313384..6607a98 100755 +--- a/src/password-store.sh ++++ b/src/password-store.sh +@@ -573,7 +573,7 @@ cmd_git() { + # END subcommand functions + # + +-PROGRAM="${0##*/}" ++PROGRAM="pass" + COMMAND="$1" + + case "$1" in |