From 796ffd9f71b94d6f78cadf4c3214778ec181dd67 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Mon, 3 May 2010 09:13:17 +0000
Subject: Move "fetchurl restricted" code to requireFile.

This reverts r21474 and r21467.
Also migrate wtk (r21472) to new API.

svn path=/nixpkgs/trunk/; revision=21575
---
 pkgs/stdenv/linux/default.nix  | 1 -
 pkgs/stdenv/native/default.nix | 1 -
 2 files changed, 2 deletions(-)

(limited to 'pkgs/stdenv')

diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 08a4772d18a..dd5647bec45 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -104,7 +104,6 @@ rec {
   fetchurl = import ../../build-support/fetchurl {
     stdenv = stdenvLinuxBoot0;
     curl = bootstrapTools;
-    inherit (allPackages) writeScript;
   };
 
 
diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix
index 719132488df..1f2117ebba0 100644
--- a/pkgs/stdenv/native/default.nix
+++ b/pkgs/stdenv/native/default.nix
@@ -119,7 +119,6 @@ rec {
     stdenv = stdenvBoot0;
     # Curl should be in /usr/bin or so.
     curl = null;
-    inherit (allPackages) writeScript;
   };
   
     
-- 
cgit 1.4.1