diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-01-17 14:19:14 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-01-17 14:19:14 +0100 |
| commit | 5bb548d2e4c866ce55efdd2e1cee5e9e72863156 (patch) | |
| tree | 9276447eeac077bcea3e6013ebb37f7bba642be8 /pkgs/development/interpreters | |
| parent | b4dd943f1635a7e8d2e440b703fa01c6c2126164 (diff) | |
| parent | 3544f3223166583f1e5459822250f1821b258c1e (diff) | |
| download | nixlib-5bb548d2e4c866ce55efdd2e1cee5e9e72863156.tar nixlib-5bb548d2e4c866ce55efdd2e1cee5e9e72863156.tar.gz nixlib-5bb548d2e4c866ce55efdd2e1cee5e9e72863156.tar.bz2 nixlib-5bb548d2e4c866ce55efdd2e1cee5e9e72863156.tar.lz nixlib-5bb548d2e4c866ce55efdd2e1cee5e9e72863156.tar.xz nixlib-5bb548d2e4c866ce55efdd2e1cee5e9e72863156.tar.zst nixlib-5bb548d2e4c866ce55efdd2e1cee5e9e72863156.zip | |
Merge remote-tracking branch 'origin/master' into stdenv-updates
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/python/2.6/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/interpreters/python/2.7/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/interpreters/python/wrapper.nix | 4 |
3 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix index 3fe753a5a6fe..f264e4179e70 100644 --- a/pkgs/development/interpreters/python/2.6/default.nix +++ b/pkgs/development/interpreters/python/2.6/default.nix @@ -68,6 +68,8 @@ let rm -rf "$out/lib/python${majorVersion}/test" ln -s $out/lib/python${majorVersion}/pdb.py $out/bin/pdb ln -s $out/lib/python${majorVersion}/pdb.py $out/bin/pdb${majorVersion} + mv $out/share/man/man1/{python.1,python2.6.1} + ln -s $out/share/man/man1/{python2.6.1,python.1} ''; passthru = { diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index 7e28cdc1db74..9fb2ab377dfc 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -76,6 +76,7 @@ let rm -rf "$out/lib/python${majorVersion}/test" ln -s $out/lib/python${majorVersion}/pdb.py $out/bin/pdb ln -s $out/lib/python${majorVersion}/pdb.py $out/bin/pdb${majorVersion} + ln -s $out/share/man/man1/{python2.7.1.gz,python.1.gz} ''; passthru = { diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix index f4892f92b417..0f2f46cd568d 100644 --- a/pkgs/development/interpreters/python/wrapper.nix +++ b/pkgs/development/interpreters/python/wrapper.nix @@ -1,12 +1,12 @@ # Create a python that knows about additional python packages via # PYTHONPATH -{stdenv, python, makeWrapper, extraLibs ? []}: +{ stdenv, python, makeWrapper, recursivePthLoader, extraLibs ? [] }: stdenv.mkDerivation { name = "python-${python.version}-wrapper"; - propagatedBuildInputs = [python makeWrapper] ++ extraLibs; + propagatedBuildInputs = extraLibs ++ [ python makeWrapper recursivePthLoader ]; unpackPhase = "true"; installPhase = '' |