mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-15 18:23:09 +00:00
9b794eb21a
Mostly bug fixes, the following changes were required in the package: * set-correct-program-name-for-sleep.patch needed to be rebased, b08781e2a6e183986eb1c24f51cdeff879b7a6af partially implemented the changes done in this patch, so we don't need to touch password-store.sh anymore. * Remove wayland patch since it is part of the release now * Reworked assert logic wrt to x11-/wayland- and dmenuSupport: passmenu now supports wayland as well via dmenu-wayland. Sadly the choice of menu is not changeable, pending https://lists.zx2c4.com/pipermail/password-store/2021-January/004363.html * Rebased no-darwin-getopt.patch * Note that f.el is no longer required Reviews would be appreciated, I might've missed something.
12 lines
449 B
Diff
12 lines
449 B
Diff
diff --git a/src/platform/darwin.sh b/src/platform/darwin.sh
|
|
index f6cc471..e2e8bba 100644
|
|
--- a/src/platform/darwin.sh
|
|
+++ b/src/platform/darwin.sh
|
|
@@ -39,6 +39,5 @@ qrcode() {
|
|
fi
|
|
}
|
|
|
|
-GETOPT="$({ test -x /usr/local/opt/gnu-getopt/bin/getopt && echo /usr/local/opt/gnu-getopt; } || brew --prefix gnu-getopt 2>/dev/null || { which port &>/dev/null && echo /opt/local; } || echo /usr/local)/bin/getopt"
|
|
SHRED="srm -f -z"
|
|
BASE64="openssl base64"
|