Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 66f5f1a75b81
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 548ced628d23
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Oct 13, 2018

  1. python.buildEnv: new argument makeWrapperArgs 

    `python.buildEnv` would already wrap executables exporting `PYTHONHOME`.
With this change, it is possible to pass in additional arguments to the
underlying `makeWrapper`.
    @FRidh
    FRidh committed Oct 13, 2018
    Copy the full SHA
    548ced6 View commit details
Showing with 3 additions and 1 deletion.
  1. +3 −1 pkgs/development/interpreters/python/wrapper.nix
4 changes: 3 additions & 1 deletion pkgs/development/interpreters/python/wrapper.nix
View file
Original file line number Diff line number Diff line change
@@ -4,6 +4,8 @@
, postBuild ? ""
, ignoreCollisions ? false
, requiredPythonModules
# Wrap executables with the given argument.
, makeWrapperArgs ? []
, }:

# Create a python executable that knows about additional packages.
@@ -32,7 +34,7 @@ let
if [ -f "$prg" ]; then
rm -f "$out/bin/$prg"
if [ -x "$prg" ]; then
makeWrapper "$path/bin/$prg" "$out/bin/$prg" --set PYTHONHOME "$out" --set PYTHONNOUSERSITE "true"
makeWrapper "$path/bin/$prg" "$out/bin/$prg" --set PYTHONHOME "$out" --set PYTHONNOUSERSITE "true" ${stdenv.lib.concatStringsSep " " makeWrapperArgs}
fi
fi
done