python-wrapper: split 'extraLibs' into 'stdLibs' and 'extraLibs', and add 'postBuild' step
The default setting for extraLibs used to be the set of modules that come with python by default but aren't usually enabled in our standard python derivation because they require additional libraries. This meant that users who want to *add* libraries to that set had to use a fairly complicated override, to add more entries without loosing the ones set by default. After this patch, the "standard libraries" such as "curses' are listed in stdLibs while the extraLibs argument remains empty by default. This allows users to override extraLibs without overriding the standard libraries. Furthermore, the wrapper environment can be messed around with in an additional 'postBuild' step. One nice application of this build step is to patch scripts and binaries to use the wrapped python interpreter instead of the pristine one, thereby enabling them to pick up all modules that have been configured. The following example shows how this is done for the 'pylint' utility: pkgs.python27Full.override { extraLibs = [pkgs.pylint]; postBuild = '' cd ${pkgs.pylint}/bin for i in *; do rm $out/bin/$i sed -r -e "s|^exec |exec $out/bin/python -- |" <$i >$out/bin/$i chmod +x $out/bin/$i done; ''; };
This commit is contained in:
parent
b53f71e715
commit
29588edfe1
|
@ -1,10 +1,12 @@
|
|||
{ stdenv, python, buildEnv, makeWrapper, recursivePthLoader, extraLibs ? [] }:
|
||||
{ stdenv, python, buildEnv, makeWrapper, recursivePthLoader, extraLibs ? [], postBuild ? ""
|
||||
, stdLibs ? stdenv.lib.attrValues python.modules
|
||||
}:
|
||||
|
||||
# Create a python executable that knows about additional packages.
|
||||
|
||||
(buildEnv {
|
||||
name = "python-${python.version}-wrapper";
|
||||
paths = stdenv.lib.filter (x : x ? pythonPath) (stdenv.lib.closePropagation extraLibs) ++ [ python recursivePthLoader ];
|
||||
paths = stdenv.lib.filter (x : x ? pythonPath) (stdenv.lib.closePropagation extraLibs) ++ stdLibs ++ [ python recursivePthLoader ];
|
||||
ignoreCollisions = false;
|
||||
|
||||
postBuild = ''
|
||||
|
@ -17,11 +19,10 @@
|
|||
|
||||
cd "${python}/bin"
|
||||
for prg in *; do
|
||||
echo "$prg --> $out/bin/$prg"
|
||||
rm -f "$out/bin/$prg"
|
||||
makeWrapper "${python}/bin/$prg" "$out/bin/$prg" --set PYTHONHOME "$out"
|
||||
done
|
||||
'';
|
||||
'' + postBuild;
|
||||
}) // {
|
||||
inherit python;
|
||||
inherit (python) meta;
|
||||
|
|
|
@ -3236,12 +3236,14 @@ let
|
|||
|
||||
pythonFull = python27Full;
|
||||
python26Full = callPackage ../development/interpreters/python/wrapper.nix {
|
||||
extraLibs = lib.attrValues python26.modules;
|
||||
extraLibs = [];
|
||||
postBuild = "";
|
||||
python = python26;
|
||||
inherit (python26Packages) recursivePthLoader;
|
||||
};
|
||||
python27Full = callPackage ../development/interpreters/python/wrapper.nix {
|
||||
extraLibs = lib.attrValues python27.modules;
|
||||
extraLibs = [];
|
||||
postBuild = "";
|
||||
python = python27;
|
||||
inherit (python27Packages) recursivePthLoader;
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue