Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

writers.makeScriptWriter: fix on Darwin\MacOS #93757

Merged
merged 3 commits into from
Jul 25, 2020
Merged

writers.makeScriptWriter: fix on Darwin\MacOS #93757

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c80e3d9
writers.makeScriptWriter: fix on Darwin\MacOS
adrian-gierakowski Jul 24, 2020
194985b
writers.makeScriptWriter: fix typo in comment
adrian-gierakowski Jul 24, 2020
6fe292d
writers.makeScriptWriter: fail build if interpreter of interpreter is…
adrian-gierakowski Jul 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 24 additions & 1 deletion pkgs/build-support/writers/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,30 @@ rec {
inherit interpreter;
contentPath = content;
}) ''
echo "#! $interpreter" > $out
# On darwin a script cannot be used as an interpreter in a shebang but
# there doesn't seem to be a limit to the size of shebang and multiple
# arguments to the interpreter are allowed.
if [[ -n "${toString pkgs.stdenvNoCC.isDarwin}" ]] && isScript $interpreter
then
wrapperInterpreterLine=$(head -1 "$interpreter" | tail -c+3)
# Get first word from the line (note: xargs echo remove leading spaces)
wrapperInterpreter=$(echo "$wrapperInterpreterLine" | xargs echo | cut -d " " -f1)
Comment on lines +30 to +32
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don’t quite understand how this is intended to work.

If $interpreter is a binary, it will go through the binary until it finds the first \n, right? But binaries can also have \0 at arbitrary positions and such …

The code seems a little confused to me, I can’t see how it would work for all interpreters.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

At this point the interpreter should never be a binary due to “ isScript $interpreter” on line 28

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

btw. I borrowed the code from patch-shebangs.sh

nixpkgs/pkgs/build-support/setup-hooks/patch-shebangs.sh

Lines 51 to 53 in e50c67a

isScript "$f" || continue
oldInterpreterLine=$(head -1 "$f" | tail -c+3)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe it should say so in a comment.


if isScript $wrapperInterpreter
then
echo "error: passed interpreter ($interpreter) is a script which has another script ($wrapperInterpreter) as an interpreter, which is not supported."
exit 1
fi

# This should work as long as wrapperInterpreter is a shell, which is
# the case for programs wrapped with makeWrapper, like
# python3.withPackages etc.
interpreterLine="$wrapperInterpreterLine $interpreter"
else
interpreterLine=$interpreter
fi

echo "#! $interpreterLine" > $out
cat "$contentPath" >> $out
${optionalString (check != "") ''
${check} $out
Expand Down