diff options
| author | Domen Kozar <domen@dev.si> | 2013-07-27 20:51:54 +0200 |
|---|---|---|
| committer | Domen Kozar <domen@dev.si> | 2013-07-29 12:09:06 +0200 |
| commit | 5ec6cf37566107f01af013abbd100d8c9aa9ec75 (patch) | |
| tree | ed9dbe95d0c31160fc6d618c33925a71dab5d3df /pkgs/development/interpreters/python | |
| parent | b253eb0d593cb1041bd9c87ab03dbf72295c79d6 (diff) | |
| download | nixlib-5ec6cf37566107f01af013abbd100d8c9aa9ec75.tar nixlib-5ec6cf37566107f01af013abbd100d8c9aa9ec75.tar.gz nixlib-5ec6cf37566107f01af013abbd100d8c9aa9ec75.tar.bz2 nixlib-5ec6cf37566107f01af013abbd100d8c9aa9ec75.tar.lz nixlib-5ec6cf37566107f01af013abbd100d8c9aa9ec75.tar.xz nixlib-5ec6cf37566107f01af013abbd100d8c9aa9ec75.tar.zst nixlib-5ec6cf37566107f01af013abbd100d8c9aa9ec75.zip | |
add python3 support to pythonPackages
Diffstat (limited to 'pkgs/development/interpreters/python')
5 files changed, 12 insertions, 4 deletions
diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix index f264e4179e70..61c997206c1a 100644 --- a/pkgs/development/interpreters/python/2.6/default.nix +++ b/pkgs/development/interpreters/python/2.6/default.nix @@ -75,6 +75,7 @@ let passthru = { inherit zlibSupport; libPrefix = "python${majorVersion}"; + executable = "python2.6"; }; enableParallelBuilding = true; diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index 76ef7399812b..f5a39a3b242b 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -85,6 +85,7 @@ let passthru = { inherit zlibSupport; libPrefix = "python${majorVersion}"; + executable = "python2.7"; }; enableParallelBuilding = true; diff --git a/pkgs/development/interpreters/python/3.2/default.nix b/pkgs/development/interpreters/python/3.2/default.nix index b3f5a17b0641..4c858c992729 100644 --- a/pkgs/development/interpreters/python/3.2/default.nix +++ b/pkgs/development/interpreters/python/3.2/default.nix @@ -32,6 +32,8 @@ stdenv.mkDerivation { sha256 = "0pxs234g08v3lar09lvzxw4vqdpwkbqmvkv894j2w7aklskcjd6v"; }; + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; + preConfigure = '' for i in /usr /sw /opt /pkg; do # improve purity substituteInPlace ./setup.py --replace $i /no-such-path @@ -58,7 +60,8 @@ stdenv.mkDerivation { readlineSupport = readline != null; opensslSupport = openssl != null; tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null); - libPrefix = "python${majorVersion}m"; + libPrefix = "python${majorVersion}"; + executable = "python3.2m"; }; enableParallelBuilding = true; diff --git a/pkgs/development/interpreters/python/3.3/default.nix b/pkgs/development/interpreters/python/3.3/default.nix index 84f4ec184aa6..7d3ede6594f8 100644 --- a/pkgs/development/interpreters/python/3.3/default.nix +++ b/pkgs/development/interpreters/python/3.3/default.nix @@ -32,6 +32,8 @@ stdenv.mkDerivation { sha256 = "16myvina7nakyyg7r5gnjyydk8bzar988vmxsw2k485w5gz04wpp"; }; + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; + preConfigure = '' for i in /usr /sw /opt /pkg; do # improve purity substituteInPlace ./setup.py --replace $i /no-such-path @@ -58,7 +60,8 @@ stdenv.mkDerivation { readlineSupport = readline != null; opensslSupport = openssl != null; tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null); - libPrefix = "python${majorVersion}m"; + libPrefix = "python${majorVersion}"; + executable = "python3.3m"; }; enableParallelBuilding = true; diff --git a/pkgs/development/interpreters/python/3.3/setup-hook.sh b/pkgs/development/interpreters/python/3.3/setup-hook.sh index e6fa34bf54ba..c272c87daf1c 100644 --- a/pkgs/development/interpreters/python/3.3/setup-hook.sh +++ b/pkgs/development/interpreters/python/3.3/setup-hook.sh @@ -1,12 +1,12 @@ addPythonPath() { - addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/python3.2/site-packages + addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/python3.3/site-packages } toPythonPath() { local paths="$1" local result= for i in $paths; do - p="$i/lib/python3.2/site-packages" + p="$i/lib/python3.3/site-packages" result="${result}${result:+:}$p" done echo $result |