Merge pull request #241457 from phaer/darwin-passage-getopt-2

passage: fix getopt path on darwin
This commit is contained in:
Weijia Wang 2023-07-04 13:35:43 +03:00 committed by GitHub
commit 97fdf20b04
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View file

@ -7,6 +7,6 @@ index 9a1fda8..4f7ce3d 100644
}
-GETOPT="$({ test -x /usr/local/opt/gnu-getopt/bin/getopt && echo /usr/local/opt/gnu-getopt; } || brew --prefix gnu-getopt 2>/dev/null || { command -v port &>/dev/null && echo /opt/local; } || echo /usr/local)/bin/getopt"
+GETOPT="@GETOPT@"
+GETOPT="@getopt@/bin/getopt"
SHRED="srm -f -z"
BASE64="openssl base64"

View file

@ -27,7 +27,7 @@ stdenv.mkDerivation {
patches = [
(substituteAll {
src = ./darwin-getopt-path.patch;
GETOPT = "${getopt}/bin/getopt";
inherit getopt;
})
];