diff options
author | Domen Kozar <domen@dev.si> | 2013-07-29 14:52:19 +0200 |
---|---|---|
committer | Domen Kozar <domen@dev.si> | 2013-07-29 14:52:19 +0200 |
commit | 918e5efb99a790362c8aa8fc70edc39f2b284575 (patch) | |
tree | 1777adbe68ea539133390f8982aefc0459d6ab7c /pkgs/development | |
parent | 4993f07feecc5650f58713866cbec57fa4c4d0a0 (diff) | |
download | nixlib-918e5efb99a790362c8aa8fc70edc39f2b284575.tar nixlib-918e5efb99a790362c8aa8fc70edc39f2b284575.tar.gz nixlib-918e5efb99a790362c8aa8fc70edc39f2b284575.tar.bz2 nixlib-918e5efb99a790362c8aa8fc70edc39f2b284575.tar.lz nixlib-918e5efb99a790362c8aa8fc70edc39f2b284575.tar.xz nixlib-918e5efb99a790362c8aa8fc70edc39f2b284575.tar.zst nixlib-918e5efb99a790362c8aa8fc70edc39f2b284575.zip |
recurse into python33 and pypy packages
Diffstat (limited to 'pkgs/development')
4 files changed, 15 insertions, 6 deletions
diff --git a/pkgs/development/interpreters/pypy/2.0/default.nix b/pkgs/development/interpreters/pypy/2.0/default.nix index f3d1e4e9ade7..2dd681239a60 100644 --- a/pkgs/development/interpreters/pypy/2.0/default.nix +++ b/pkgs/development/interpreters/pypy/2.0/default.nix @@ -7,6 +7,8 @@ let majorVersion = "2.0"; version = "${majorVersion}.2"; + pythonVersion = "2.7"; + libPrefix = "pypy${majorVersion}"; pypy = stdenv.mkDerivation rec { name = "pypy-${version}"; @@ -57,18 +59,21 @@ let ''; installPhase = '' - mkdir -p $out/bin - mkdir -p $out/pypy-c - # TODO: make libPrefix work + mkdir -p $out/{bin,include,lib,pypy-c} + cp -R {include,lib_pypy,lib-python,pypy-c} $out/pypy-c ln -s $out/pypy-c/pypy-c $out/bin/pypy chmod +x $out/bin/pypy + + # other packages expect to find stuff according to libPrefix + ln -s $out/pypy-c/include $out/include/${libPrefix} + ln -s $out/pypy-c/lib-python/${pythonVersion} $out/lib/${libPrefix} + # TODO: compile python files? ''; passthru = { - inherit zlibSupport; - libPrefix = "pypy${majorVersion}"; + inherit zlibSupport libPrefix; executable = "pypy"; }; diff --git a/pkgs/development/interpreters/python/3.2/default.nix b/pkgs/development/interpreters/python/3.2/default.nix index 4c858c992729..e09602e7381e 100644 --- a/pkgs/development/interpreters/python/3.2/default.nix +++ b/pkgs/development/interpreters/python/3.2/default.nix @@ -51,6 +51,7 @@ stdenv.mkDerivation { postInstall = '' rm -rf "$out/lib/python${majorVersion}/test" + ln -s "$out/include/python${majorVersion}m" "$out/include/python${majorVersion}" ''; passthru = { @@ -62,6 +63,7 @@ stdenv.mkDerivation { tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null); libPrefix = "python${majorVersion}"; executable = "python3.2m"; + is_py3k = true; }; enableParallelBuilding = true; diff --git a/pkgs/development/interpreters/python/3.3/default.nix b/pkgs/development/interpreters/python/3.3/default.nix index 7d3ede6594f8..509249b7f240 100644 --- a/pkgs/development/interpreters/python/3.3/default.nix +++ b/pkgs/development/interpreters/python/3.3/default.nix @@ -51,6 +51,7 @@ stdenv.mkDerivation { postInstall = '' rm -rf "$out/lib/python${majorVersion}/test" + ln -s "$out/include/python${majorVersion}m" "$out/include/python${majorVersion}" ''; passthru = { @@ -62,6 +63,7 @@ stdenv.mkDerivation { tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null); libPrefix = "python${majorVersion}"; executable = "python3.3m"; + is_py3k = true; }; enableParallelBuilding = true; diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index cc80388e6899..6a7d5e5f3d5e 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -55,7 +55,7 @@ python.stdenv.mkDerivation (attrs // { meta = { platforms = python.meta.platforms; } // meta // { - maintainers = (meta.maintainers or []) ++ [ lib.maintainers.chaoflow ]; + maintainers = (meta.maintainers or []) ++ [ lib.maintainers.chaoflow lib.maintainers.iElectric ]; }; # checkPhase after installPhase to run tests on installed packages |