diff options
| author | Lluís Batlle i Rossell <viric@viric.name> | 2013-02-18 13:49:11 +0100 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@viric.name> | 2013-02-18 13:49:11 +0100 |
| commit | bcbf9472ea1af1ccdd2485e97960ebe94dddd633 (patch) | |
| tree | de782c37236d55b5fe6b85cb29ba0fa6928f9cdb /pkgs/development/interpreters/python | |
| parent | 26e4a5561c56c388a4959aba9c4293a6ed87184b (diff) | |
| parent | b076ab94d63bf903710dbd126692f5e889c27a0c (diff) | |
| download | nixlib-bcbf9472ea1af1ccdd2485e97960ebe94dddd633.tar nixlib-bcbf9472ea1af1ccdd2485e97960ebe94dddd633.tar.gz nixlib-bcbf9472ea1af1ccdd2485e97960ebe94dddd633.tar.bz2 nixlib-bcbf9472ea1af1ccdd2485e97960ebe94dddd633.tar.lz nixlib-bcbf9472ea1af1ccdd2485e97960ebe94dddd633.tar.xz nixlib-bcbf9472ea1af1ccdd2485e97960ebe94dddd633.tar.zst nixlib-bcbf9472ea1af1ccdd2485e97960ebe94dddd633.zip | |
Merge remote-tracking branch 'central/master' into x-updates
Diffstat (limited to 'pkgs/development/interpreters/python')
| -rw-r--r-- | pkgs/development/interpreters/python/python-linkme-wrapper.sh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/development/interpreters/python/python-linkme-wrapper.sh b/pkgs/development/interpreters/python/python-linkme-wrapper.sh index e6307d81ed44..42674aa83b08 100644 --- a/pkgs/development/interpreters/python/python-linkme-wrapper.sh +++ b/pkgs/development/interpreters/python/python-linkme-wrapper.sh @@ -14,13 +14,12 @@ PROG=$(basename "$0") SITES= pypath() { - BIN=$(dirname "$1") - BIN=$(realpath -s "$BIN") + BIN=$(realpath -s "$(dirname "$1")") ENV=$(dirname "$BIN") SITE="$ENV/lib/python2.7/site-packages" SITES="$SITES${SITES:+:}$SITE" - PRG=$BIN/$(readlink "$1") + PRG="$BIN"/$(readlink "$1") if test -L "$PRG"; then pypath "$PRG" @@ -31,4 +30,4 @@ pypath $(realpath -s "$0") export PYTHONPATH="$PYTHONPATH${PYTHONPATH:+:}$SITES" -exec $BIN/$PROG "$@" +exec "$BIN/$PROG" "$@" |