From e1f901c117bcc82157a1bd3167909284cc7bf926 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 19 Jan 2012 16:50:09 +0000 Subject: [PATCH] =?UTF-8?q?*=20Build=20=E2=80=98xz=E2=80=99=20during=20the?= =?UTF-8?q?=20stdenvNative=20bootstrap,=20since=20we=20really=20can't=20?= =?UTF-8?q?=20=20rely=20on=20it=20being=20present.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit svn path=/nixpkgs/branches/stdenv-updates/; revision=31707 --- pkgs/stdenv/native/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix index 3319a0d92719..28f077aa8ef8 100644 --- a/pkgs/stdenv/native/default.nix +++ b/pkgs/stdenv/native/default.nix @@ -83,7 +83,7 @@ rec { # A function that builds a "native" stdenv (one that uses tools in # /usr etc.). makeStdenv = - {gcc, fetchurl, extraPath ? []}: + { gcc, fetchurl, extraPath ? [], overrides ? (pkgs: { }) }: import ../generic { name = "stdenv-native"; @@ -100,7 +100,7 @@ rec { 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 - # most systems don't have, so we mustn't rely on the native - # environment providing it). + # Using that, build a stdenv that adds the ‘xz’ command (which most + # systems don't have, so we mustn't rely on the native environment + # providing it). stdenvBoot2 = makeStdenv { inherit gcc fetchurl; - extraPath = [stdenvBoot1Pkgs.replace]; + extraPath = [ stdenvBoot1Pkgs.xz ]; + overrides = pkgs: { inherit (stdenvBoot1Pkgs) xz; }; };