about summary refs log tree commit diff
path: root/pkgs/build-support/setup-hooks
diff options
context:
space:
mode:
authorVladimír Čunát <v@cunat.cz>2023-05-01 10:17:18 +0200
committerVladimír Čunát <v@cunat.cz>2023-05-01 10:17:18 +0200
commit50983f16a329e701b8a6d50897282cec6cbd6246 (patch)
tree3ef78df467fd7f9ffc66e9078e5cef64bf5f8e05 /pkgs/build-support/setup-hooks
parent0905eb98b099319baa485496b6b53df3c2299124 (diff)
parenta2332386df7415d048f8291c75d25e65868efa91 (diff)
Merge #229154: staging: make wrapProgram<Type> use the right wrapper
...into staging
Diffstat (limited to 'pkgs/build-support/setup-hooks')
-rw-r--r--pkgs/build-support/setup-hooks/make-binary-wrapper/make-binary-wrapper.sh2
-rw-r--r--pkgs/build-support/setup-hooks/make-wrapper.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/build-support/setup-hooks/make-binary-wrapper/make-binary-wrapper.sh b/pkgs/build-support/setup-hooks/make-binary-wrapper/make-binary-wrapper.sh
index 5f759d323cf62..88a50befd7328 100644
--- a/pkgs/build-support/setup-hooks/make-binary-wrapper/make-binary-wrapper.sh
+++ b/pkgs/build-support/setup-hooks/make-binary-wrapper/make-binary-wrapper.sh
@@ -67,7 +67,7 @@ wrapProgramBinary() {
       hidden="${hidden}_"
     done
     mv "$prog" "$hidden"
-    makeWrapper "$hidden" "$prog" --inherit-argv0 "${@:2}"
+    makeBinaryWrapper "$hidden" "$prog" --inherit-argv0 "${@:2}"
 }
 
 # Generate source code for the wrapper in such a way that the wrapper inputs
diff --git a/pkgs/build-support/setup-hooks/make-wrapper.sh b/pkgs/build-support/setup-hooks/make-wrapper.sh
index 84e5ecee2909e..4932e934ec163 100644
--- a/pkgs/build-support/setup-hooks/make-wrapper.sh
+++ b/pkgs/build-support/setup-hooks/make-wrapper.sh
@@ -217,5 +217,5 @@ wrapProgramShell() {
       hidden="${hidden}_"
     done
     mv "$prog" "$hidden"
-    makeWrapper "$hidden" "$prog" --inherit-argv0 "${@:2}"
+    makeShellWrapper "$hidden" "$prog" --inherit-argv0 "${@:2}"
 }