stdenvs: Distinguish between extraBuildInputs and extraNativeBuildInputs

Additionally, instead of pulling them from `setup.sh`, route them via
Nix. This gets us one step closer to making stdenv be a plain attribute
set instead of a derivation.
This commit is contained in:
John Ericson
2017-08-15 18:24:54 -04:00
parent a71cf06b16
commit eeabf85780
7 changed files with 47 additions and 28 deletions
+4 -4
View File
@@ -66,7 +66,7 @@ let
export lt_cv_deplibs_check_method=pass_all
'';
extraBuildInputsCygwin = [
extraNativeBuildInputsCygwin = [
../cygwin/all-buildinputs-as-runtimedep.sh
../cygwin/wrap-exes-to-find-dlls.sh
] ++ (if system == "i686-cygwin" then [
@@ -94,9 +94,9 @@ let
if system == "x86_64-cygwin" then prehookCygwin else
prehookBase;
extraBuildInputs =
if system == "i686-cygwin" then extraBuildInputsCygwin else
if system == "x86_64-cygwin" then extraBuildInputsCygwin else
extraNativeBuildInputs =
if system == "i686-cygwin" then extraNativeBuildInputsCygwin else
if system == "x86_64-cygwin" then extraNativeBuildInputsCygwin else
[];
initialPath = extraPath ++ path;