diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-08-15 11:30:45 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-08-15 18:24:54 -0400 |
| commit | eeabf85780e7fccc0289b4015b695e28ef166ab7 (patch) | |
| tree | 9eb4066d881737598ccb002783435b325fa74a35 /pkgs/stdenv/native | |
| parent | a71cf06b162b98282a7688f8ac221498cfd6a7e2 (diff) | |
| download | nixpkgs-eeabf85780e7fccc0289b4015b695e28ef166ab7.tar nixpkgs-eeabf85780e7fccc0289b4015b695e28ef166ab7.tar.gz nixpkgs-eeabf85780e7fccc0289b4015b695e28ef166ab7.tar.bz2 nixpkgs-eeabf85780e7fccc0289b4015b695e28ef166ab7.tar.lz nixpkgs-eeabf85780e7fccc0289b4015b695e28ef166ab7.tar.xz nixpkgs-eeabf85780e7fccc0289b4015b695e28ef166ab7.tar.zst nixpkgs-eeabf85780e7fccc0289b4015b695e28ef166ab7.zip | |
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.
Diffstat (limited to 'pkgs/stdenv/native')
| -rw-r--r-- | pkgs/stdenv/native/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix index 02734f2f3e5..9ecb56028bc 100644 --- a/pkgs/stdenv/native/default.nix +++ b/pkgs/stdenv/native/default.nix @@ -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; |