From 10d67f5c7a45460d03116b506de72ed8c7990e25 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 14 Jul 2006 09:28:09 +0000 Subject: * Reviving stdenvNix. svn path=/nixpkgs/trunk/; revision=5702 --- pkgs/stdenv/nix/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/stdenv/nix') diff --git a/pkgs/stdenv/nix/default.nix b/pkgs/stdenv/nix/default.nix index 6bcc366a51df0..34109e2dbc79c 100644 --- a/pkgs/stdenv/nix/default.nix +++ b/pkgs/stdenv/nix/default.nix @@ -1,4 +1,4 @@ -{stdenv, pkgs, genericStdenv, gccWrapper}: +{stdenv, pkgs, genericStdenv}: genericStdenv { name = "stdenv-nix"; @@ -7,12 +7,12 @@ genericStdenv { inherit stdenv; - gcc = gccWrapper { - name = pkgs.gcc.name; + gcc = import ../../build-support/gcc-wrapper { nativeTools = false; nativeGlibc = true; - inherit (pkgs) gcc binutils; inherit stdenv; + inherit (pkgs) binutils; + gcc = pkgs.gcc.gcc; shell = pkgs.bash ~ /bin/sh; }; -- cgit 1.4.1