From 3980444b2b918ef74ac7b9f1128f399767d06fa1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 19 Jan 2012 18:25:35 +0000 Subject: [PATCH] * Reuse packages in the Darwin stdenv to prevent unnecessary rebuilds. svn path=/nixpkgs/branches/stdenv-updates/; revision=31710 --- pkgs/stdenv/nix/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/stdenv/nix/default.nix b/pkgs/stdenv/nix/default.nix index b7411290f9fd..7eac06500032 100644 --- a/pkgs/stdenv/nix/default.nix +++ b/pkgs/stdenv/nix/default.nix @@ -1,6 +1,6 @@ -{stdenv, pkgs}: +{ stdenv, pkgs }: -import ../generic { +import ../generic rec { name = "stdenv-nix"; preHook = @@ -38,4 +38,12 @@ import ../generic { shell = pkgs.bash + "/bin/sh"; fetchurlBoot = stdenv.fetchurlBoot; + + overrides = pkgs_: { + inherit gcc; + inherit (gcc) binutils; + inherit (pkgs) + gzip bzip2 xz bash coreutils diffutils findutils gawk + gnumake gnused gnutar gnugrep gnupatch perl; + }; }