From 12ae5363ea658d399bdb008f6ded3cde355f9310 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 29 Mar 2004 17:23:01 +0000
Subject: * Remove trivial builders. * Make builders unexecutable by removing
 the hash-bang line and   execute permission. * Convert calls to `derivation'
 to `mkDerivation'. * Remove `system' and `stdenv' attributes from calls to  
 `mkDerivation'.  These transformations were all done automatically,   so it
 is quite possible I broke stuff. * Put the `mkDerivation' function in
 stdenv/generic.

svn path=/nixpkgs/trunk/; revision=874
---
 pkgs/stdenv/native/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'pkgs/stdenv/native')

diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix
index 8a57b10d71b3..143230fbd893 100644
--- a/pkgs/stdenv/native/default.nix
+++ b/pkgs/stdenv/native/default.nix
@@ -1,17 +1,19 @@
-{stdenv}:
+{stdenv, genericStdenv, gccWrapper}:
 
-(import ../generic) {
+genericStdenv {
   name = "stdenv-native";
   preHook = ./prehook.sh;
   initialPath = "/usr/local /usr /";
 
   inherit stdenv;
 
-  gcc = (import ../../build-support/gcc-wrapper) {
+  gcc = gccWrapper {
     name = "gcc-native";
     nativeTools = true;
     nativeGlibc = true;
     nativePrefix = "/usr";
     inherit stdenv;
   };
+
+  bash = "/bin/sh";
 }
-- 
cgit 1.4.1