JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wrapPython: fix replace of env invokations

Browse Source
This commit is contained in:
Nikolay Amiantov 2016-08-23 17:54:11 +03:00
parent ed20bbc8fb
commit 13c04c837d
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/python-modules/generic/wrap.sh
View File

@ -8,7 +8,6 @@ wrapPythonPrograms() {
# of dependencies. # of dependencies.
buildPythonPath() { buildPythonPath() {
local pythonPath="$1" local pythonPath="$1"
local python="@executable@"
local path local path
# Create an empty table of python paths (see doc on _addToPythonPath # Create an empty table of python paths (see doc on _addToPythonPath
@ -51,9 +50,9 @@ wrapPythonProgramsIn() {
for f in $(find "$dir" -type f -perm -0100); do for f in $(find "$dir" -type f -perm -0100); do
# Rewrite "#! .../env python" to "#! /nix/store/.../python". # Rewrite "#! .../env python" to "#! /nix/store/.../python".
# Strip suffix, like "3" or "2.7m" -- we don't have any choice on which # Strip suffix, like "3" or "2.7m" -- we don't have any choice on which
# Python to use besides one in $python anyway. # Python to use besides one with this hook anyway.
if head -n1 "$f" | grep -q '#!.*/env.*\(python\|pypy\)'; then if head -n1 "$f" | grep -q '#!.*/env.*\(python\|pypy\)'; then
sed -i "$f" -e "1 s^.*/env[ ]*\(python\|pypy\)[^ ]*^#! $python^" sed -i "$f" -e "1 s^.*/env[ ]*\(python\|pypy\)[^ ]*^#! @executable@^"
fi fi
# catch /python and /.python-wrapped # catch /python and /.python-wrapped