diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2010-05-03 09:13:17 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2010-05-03 09:13:17 +0000 |
| commit | 796ffd9f71b94d6f78cadf4c3214778ec181dd67 (patch) | |
| tree | f1dc1eac7b915da621a6ec74d3d0fad54a799cf1 /pkgs/stdenv | |
| parent | 2d9ba975e788a134c254e1967758f85f9db4e876 (diff) | |
| download | nixpkgs-796ffd9f71b94d6f78cadf4c3214778ec181dd67.tar nixpkgs-796ffd9f71b94d6f78cadf4c3214778ec181dd67.tar.gz nixpkgs-796ffd9f71b94d6f78cadf4c3214778ec181dd67.tar.bz2 nixpkgs-796ffd9f71b94d6f78cadf4c3214778ec181dd67.tar.lz nixpkgs-796ffd9f71b94d6f78cadf4c3214778ec181dd67.tar.xz nixpkgs-796ffd9f71b94d6f78cadf4c3214778ec181dd67.tar.zst nixpkgs-796ffd9f71b94d6f78cadf4c3214778ec181dd67.zip | |
Move "fetchurl restricted" code to requireFile.
This reverts r21474 and r21467. Also migrate wtk (r21472) to new API. svn path=/nixpkgs/trunk/; revision=21575
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/linux/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/stdenv/native/default.nix | 1 |
2 files changed, 0 insertions, 2 deletions
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; }; |