311aa5d8d9
This should fix #7366 for now, but using the (IMHO) pragmatic approach of extending the sed expression to recognize strings. However, this approach is obviously not parsing the full AST, nor does it wrap Python itself (as pointed out by @spwhitt in #7366) but tries to match Python strings as best as possible without getting TOO unreadable. We also use a little bit of Nix to help generating the SED expression, because doing the whole quote matching block over and over again would be quite repetitious and error-prone to change. The reason why I'm using imap here is that we need to have unique labels to avoid jumping into the wrong branch. So the new expression is not only able to match continous regions of triple-quoted strings, but also regions with only one quote character (even with escaped inner quotes) and empty strings. However, what it doesn't correctly recognize is something like this: "string1" "string2" "multi line string" Which is very unlikely that we'll find something like this in the wild. Of course, we could handle it as well, but it would mean that we need to substitute the current line into hold space until we're finished parsing the strings, branch off to another label where we match multiline strings of all sorts and swap hold/pattern space and finally print the result. So to summarize: The SED expression would be 3 to 4 times bigger than now and we gain very little from that. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
67 lines
2 KiB
Bash
67 lines
2 KiB
Bash
wrapPythonPrograms() {
|
|
wrapPythonProgramsIn $out "$out $pythonPath"
|
|
}
|
|
|
|
wrapPythonProgramsIn() {
|
|
local dir="$1"
|
|
local pythonPath="$2"
|
|
local python="@executable@"
|
|
local i
|
|
|
|
declare -A pythonPathsSeen=()
|
|
program_PYTHONPATH=
|
|
program_PATH=
|
|
for i in $pythonPath; do
|
|
_addToPythonPath $i
|
|
done
|
|
|
|
for i in $(find "$dir" -type f -perm +0100); do
|
|
# Rewrite "#! .../env python" to "#! /nix/store/.../python".
|
|
if head -n1 "$i" | grep -q '#!.*/env.*\(python\|pypy\)'; then
|
|
sed -i "$i" -e "1 s^.*/env[ ]*\(python\|pypy\)^#! $python^"
|
|
fi
|
|
|
|
# catch /python and /.python-wrapped
|
|
if head -n1 "$i" | grep -q '/\.\?\(python\|pypy\)'; then
|
|
# dont wrap EGG-INFO scripts since they are called from python
|
|
if echo "$i" | grep -v EGG-INFO/scripts; then
|
|
echo "wrapping \`$i'..."
|
|
sed -i "$i" -re '@magicalSedExpression@'
|
|
wrapProgram "$i" \
|
|
--prefix PYTHONPATH ":" $program_PYTHONPATH \
|
|
--prefix PATH ":" $program_PATH
|
|
fi
|
|
fi
|
|
done
|
|
}
|
|
|
|
_addToPythonPath() {
|
|
local dir="$1"
|
|
if [ -n "${pythonPathsSeen[$dir]}" ]; then return; fi
|
|
pythonPathsSeen[$dir]=1
|
|
addToSearchPath program_PYTHONPATH $dir/lib/@libPrefix@/site-packages
|
|
addToSearchPath program_PATH $dir/bin
|
|
local prop="$dir/nix-support/propagated-native-build-inputs"
|
|
if [ -e $prop ]; then
|
|
local i
|
|
for i in $(cat $prop); do
|
|
_addToPythonPath $i
|
|
done
|
|
fi
|
|
}
|
|
|
|
createBuildInputsPth() {
|
|
local category="$1"
|
|
local inputs="$2"
|
|
if [ foo"$inputs" != foo ]; then
|
|
for x in $inputs; do
|
|
if $(echo -n $x |grep -q python-recursive-pth-loader); then
|
|
continue
|
|
fi
|
|
if test -d "$x"/lib/@libPrefix@/site-packages; then
|
|
echo $x/lib/@libPrefix@/site-packages \
|
|
>> "$out"/lib/@libPrefix@/site-packages/${name}-nix-python-$category.pth
|
|
fi
|
|
done
|
|
fi
|
|
}
|