From a919a6e611dadecf1e2847ca1d899accd70c41b3 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Sun, 2 Feb 2025 21:45:05 -0500 Subject: [PATCH] makeBinaryWrapper: use GNU bintools for extractCmd Only GNU supports the -d flag used. In a different environment, the command fails as follows: strings: error: unknown argument '-d' Note: I believe it was not noticed because the command is used in Firefox wrapper only where its failure is silently swallowed. The only side effect then is that the wrapper won't work as expected when wrapping a wrapper. Signed-off-by: Ihar Hrachyshka --- pkgs/by-name/ma/makeBinaryWrapper/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ma/makeBinaryWrapper/package.nix b/pkgs/by-name/ma/makeBinaryWrapper/package.nix index 3ee645ad91f8..749851d547e2 100644 --- a/pkgs/by-name/ma/makeBinaryWrapper/package.nix +++ b/pkgs/by-name/ma/makeBinaryWrapper/package.nix @@ -25,7 +25,7 @@ makeSetupHook { passthru = { # Extract the function call used to create a binary wrapper from its embedded docstring extractCmd = writeShellScript "extract-binary-wrapper-cmd" '' - ${cc.bintools.targetPrefix}strings -dw "$1" | sed -n '/^makeCWrapper/,/^$/ p' + ${targetPackages.gnuStdenv.cc.bintools.targetPrefix}strings -dw "$1" | sed -n '/^makeCWrapper/,/^$/ p' ''; tests = tests.makeBinaryWrapper;