JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Build ‘xz’ during the stdenvNative bootstrap, since we really can't

Browse Source 
rely on it being present.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31707
This commit is contained in:
Eelco Dolstra 2012-01-19 16:50:09 +00:00
parent 6b8e8bfedb
commit e1f901c117
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/stdenv/native/default.nix
View File

@ -83,7 +83,7 @@ rec {
# A function that builds a "native" stdenv (one that uses tools in # A function that builds a "native" stdenv (one that uses tools in
# /usr etc.). # /usr etc.).
makeStdenv = makeStdenv =
{gcc, fetchurl, extraPath ? []}: { gcc, fetchurl, extraPath ? [], overrides ? (pkgs: { }) }:
import ../generic { import ../generic {
name = "stdenv-native"; name = "stdenv-native";
@ -100,7 +100,7 @@ rec {
fetchurlBoot = fetchurl; fetchurlBoot = fetchurl;
inherit system shell gcc; inherit system shell gcc overrides;
}; };
@ -137,12 +137,13 @@ rec {
}; };
# Using that, build a stdenv that adds the `replace' command (which # Using that, build a stdenv that adds the ‘xz’ command (which most
# most systems don't have, so we mustn't rely on the native # systems don't have, so we mustn't rely on the native environment
# environment providing it). # providing it).
stdenvBoot2 = makeStdenv { stdenvBoot2 = makeStdenv {
inherit gcc fetchurl; inherit gcc fetchurl;
extraPath = [stdenvBoot1Pkgs.replace]; extraPath = [ stdenvBoot1Pkgs.xz ];
overrides = pkgs: { inherit (stdenvBoot1Pkgs) xz; };
}; };