From 39d1bc755eb2c4dd7bad3b7dc5dc516dfc02d5f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 13 Nov 2014 00:42:12 +0100 Subject: [PATCH] python: add python.interpreter attribute --- pkgs/development/interpreters/pypy/2.4/default.nix | 3 ++- pkgs/development/interpreters/python/2.6/default.nix | 1 + pkgs/development/interpreters/python/2.7/default.nix | 1 + pkgs/development/interpreters/python/3.2/default.nix | 1 + pkgs/development/interpreters/python/3.3/default.nix | 1 + pkgs/development/interpreters/python/3.4/default.nix | 1 + 6 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/pypy/2.4/default.nix b/pkgs/development/interpreters/pypy/2.4/default.nix index 786622fe4cc..4c9bf13937c 100644 --- a/pkgs/development/interpreters/pypy/2.4/default.nix +++ b/pkgs/development/interpreters/pypy/2.4/default.nix @@ -95,11 +95,12 @@ let --set LIBRARY_PATH "${LIBRARY_PATH}" ''; - passthru = { + passthru = rec { inherit zlibSupport libPrefix; executable = "pypy"; isPypy = true; buildEnv = callPackage ../../python/wrapper.nix { python = self; }; + interpreter = "${self}/bin/${executable}"; }; enableParallelBuilding = true; diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix index bb6dea2a4a3..3894f401d4a 100644 --- a/pkgs/development/interpreters/python/2.6/default.nix +++ b/pkgs/development/interpreters/python/2.6/default.nix @@ -93,6 +93,7 @@ let libPrefix = "python${majorVersion}"; executable = libPrefix; sitePackages = "lib/${libPrefix}/site-packages"; + interpreter = "${self}/bin/${executable}"; }; enableParallelBuilding = true; diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index 7ebc9d3e356..8588cd812fc 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -100,6 +100,7 @@ let libPrefix = "python${majorVersion}"; executable = libPrefix; sitePackages = "lib/${libPrefix}/site-packages"; + interpreter = "${self}/bin/${executable}"; }; enableParallelBuilding = true; diff --git a/pkgs/development/interpreters/python/3.2/default.nix b/pkgs/development/interpreters/python/3.2/default.nix index 9222f9fc4e1..d3f5c6e1f13 100644 --- a/pkgs/development/interpreters/python/3.2/default.nix +++ b/pkgs/development/interpreters/python/3.2/default.nix @@ -80,6 +80,7 @@ stdenv.mkDerivation { isPy32 = true; is_py3k = true; # deprecated sitePackages = "lib/${libPrefix}/site-packages"; + interpreter = "${self}/bin/${executable}"; }; enableParallelBuilding = true; diff --git a/pkgs/development/interpreters/python/3.3/default.nix b/pkgs/development/interpreters/python/3.3/default.nix index f9616701829..1f91d1bbaf4 100644 --- a/pkgs/development/interpreters/python/3.3/default.nix +++ b/pkgs/development/interpreters/python/3.3/default.nix @@ -81,6 +81,7 @@ stdenv.mkDerivation { isPy33 = true; is_py3k = true; # deprecated sitePackages = "lib/${libPrefix}/site-packages"; + interpreter = "${self}/bin/${executable}"; }; enableParallelBuilding = true; diff --git a/pkgs/development/interpreters/python/3.4/default.nix b/pkgs/development/interpreters/python/3.4/default.nix index e585c6c148d..3cadfc2d22f 100644 --- a/pkgs/development/interpreters/python/3.4/default.nix +++ b/pkgs/development/interpreters/python/3.4/default.nix @@ -83,6 +83,7 @@ stdenv.mkDerivation { isPy34 = true; is_py3k = true; # deprecated sitePackages = "lib/${libPrefix}/site-packages"; + interpreter = "${self}/bin/${executable}"; }; enableParallelBuilding = true;