diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-11-22 22:48:43 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-11-22 22:48:43 +0000 |
| commit | 45886e474dfafe012fd88d88deb3158cf66f64ae (patch) | |
| tree | c06dbb12e431ff070c5699e834d6cd8c4695cbd7 /pkgs/stdenv/adapters.nix | |
| parent | 98af7b9cb92c3a6569fb7bb4c8bcce1c1970678e (diff) | |
| download | nixlib-45886e474dfafe012fd88d88deb3158cf66f64ae.tar nixlib-45886e474dfafe012fd88d88deb3158cf66f64ae.tar.gz nixlib-45886e474dfafe012fd88d88deb3158cf66f64ae.tar.bz2 nixlib-45886e474dfafe012fd88d88deb3158cf66f64ae.tar.lz nixlib-45886e474dfafe012fd88d88deb3158cf66f64ae.tar.xz nixlib-45886e474dfafe012fd88d88deb3158cf66f64ae.tar.zst nixlib-45886e474dfafe012fd88d88deb3158cf66f64ae.zip | |
On native builds:
- Disabling guile test, because one fails. I commented on that in the source. On cross builds: - Adding stripping - Updating the glibc-2.11 expression to match the parameters of glibc-2.9, which I was updating more. - Renaming from selfNativeBuildInput to selfBuildNativeInput, so this matches better the pattern buildNativeInputs. svn path=/nixpkgs/branches/stdenv-updates/; revision=18550
Diffstat (limited to 'pkgs/stdenv/adapters.nix')
| -rw-r--r-- | pkgs/stdenv/adapters.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 698253c0c63a..9789a52255e3 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -112,7 +112,7 @@ rec { makeStdenvCross = stdenv: cross: binutilsCross: gccCross: stdenv // { mkDerivation = {name ? "", buildInputs ? [], buildNativeInputs ? [], propagatedBuildInputs ? [], propagatedBuildNativeInputs ? [], - selfNativeBuildInput ? false, ...}@args: let + selfBuildNativeInput ? false, ...}@args: let # *BuildInputs exists temporarily as another name for # *HostInputs. @@ -146,7 +146,7 @@ rec { buildNativeInputs = buildNativeInputsDrvs ++ nativeInputsFromBuildInputs ++ [ gccCross binutilsCross ] ++ - stdenv.lib.optional selfNativeBuildInput buildDrv; + stdenv.lib.optional selfBuildNativeInput buildDrv; buildInputs = buildInputsDrvs; propagatedBuildInputs = propagatedBuildInputsDrvs; propagatedBuildNativeInputs = propagatedBuildNativeInputsDrvs; |