diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-11-17 13:26:21 -0500 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-11-21 10:44:44 -0500 |
| commit | da19c34d0fd335424e734c3bec9ca87687eb15f0 (patch) | |
| tree | d6ee6f1c3e16dfc3d3dab6226bfd9cff97e296de /pkgs/development/interpreters/python/wrap.sh | |
| parent | 652c2beda9a5351ddd07e422215100aca75412ae (diff) | |
| download | nixpkgs-da19c34d0fd335424e734c3bec9ca87687eb15f0.tar nixpkgs-da19c34d0fd335424e734c3bec9ca87687eb15f0.tar.gz nixpkgs-da19c34d0fd335424e734c3bec9ca87687eb15f0.tar.bz2 nixpkgs-da19c34d0fd335424e734c3bec9ca87687eb15f0.tar.lz nixpkgs-da19c34d0fd335424e734c3bec9ca87687eb15f0.tar.xz nixpkgs-da19c34d0fd335424e734c3bec9ca87687eb15f0.tar.zst nixpkgs-da19c34d0fd335424e734c3bec9ca87687eb15f0.zip | |
stdenv setup: Always use both propagated files
This continues #23374, which always kept around both attributes, by always including both propagated files: `propgated-native-build-inputs` and `propagated-build-inputs`. `nativePkgs` and `crossPkgs` are still defined as before, however, so this change should only barely observable. This is an incremental step to fully keeping the dependencies separate in all cases.
Diffstat (limited to 'pkgs/development/interpreters/python/wrap.sh')
| -rw-r--r-- | pkgs/development/interpreters/python/wrap.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/interpreters/python/wrap.sh b/pkgs/development/interpreters/python/wrap.sh index 37bd5b09739..01b573e6ad5 100644 --- a/pkgs/development/interpreters/python/wrap.sh +++ b/pkgs/development/interpreters/python/wrap.sh @@ -83,7 +83,7 @@ wrapPythonProgramsIn() { # Adds the lib and bin directories to the PYTHONPATH and PATH variables, # respectively. Recurses on any paths declared in -# `propagated-native-build-inputs`, while avoiding duplicating paths by +# `propagated-build-inputs`, while avoiding duplicating paths by # flagging the directories it has visited in `pythonPathsSeen`. _addToPythonPath() { local dir="$1" @@ -96,7 +96,7 @@ _addToPythonPath() { addToSearchPath program_PATH $dir/bin # Inspect the propagated inputs (if they exist) and recur on them. - local prop="$dir/nix-support/propagated-native-build-inputs" + local prop="$dir/nix-support/propagated-build-inputs" if [ -e $prop ]; then local new_path for new_path in $(cat $prop); do |