From 32d566e1b9d9ff55ec5b013d5420419649780e0d Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 8 Dec 2021 18:59:38 +0200 Subject: [PATCH] wrapProgramBinary -> binaryWrapProgram --- doc/stdenv/stdenv.chapter.md | 4 ++-- pkgs/build-support/setup-hooks/make-binary-wrapper.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index 91e59bbce48e..bd9d9e1e3689 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -796,7 +796,7 @@ A setup-hook very similar to `makeWrapper`, only it creates a tiny _compiled_ wr Compiled wrappers generated by `makeBinaryWrapper` can be inspected with `less ` - by scrolling past the binary data you should be able to see the C code that generated the executable and there see the environment variables that were injected into the wrapper. -Similarly to `wrapProgram`, the `makeBinaryWrapper` setup-hook provides a `wrapProgramBinary` with similar command line arguments. +Similarly to `wrapProgram`, the `makeBinaryWrapper` setup-hook provides a `binaryWrapProgram` with similar command line arguments. ### `substitute` \ \ \ {#fun-substitute} @@ -875,7 +875,7 @@ Convenience function for `makeWrapper` that replaces `<\executable\>` with a wra If you will apply it multiple times, it will overwrite the wrapper file and you will end up with double wrapping, which should be avoided. -### `wrapProgramBinary` \ \ {#fun-wrapProgramBinary} +### `binaryWrapProgram` \ \ {#fun-binaryWrapProgram} Convenience function for `makeBinaryWrapper` that replaces `<\executable\>` with a wrapper that executes the original program. It takes all the same arguments as `makeBinaryWrapper`, except for `--argv0`. diff --git a/pkgs/build-support/setup-hooks/make-binary-wrapper.sh b/pkgs/build-support/setup-hooks/make-binary-wrapper.sh index ec60f9ba7223..d4d4163c4b75 100644 --- a/pkgs/build-support/setup-hooks/make-binary-wrapper.sh +++ b/pkgs/build-support/setup-hooks/make-binary-wrapper.sh @@ -34,8 +34,8 @@ makeBinaryWrapper() { makeDocumentedCWrapper "$1" "${@:3}" | cc -Os -x c -o "$2" - } -# Syntax: wrapProgramBinary -wrapProgramBinary() { +# Syntax: binaryWrapProgram +binaryWrapProgram() { local prog="$1" local hidden