From deaacb7a0f9df5e0f20bd98265094f7d871c09cd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 17 Aug 2006 08:49:13 +0000
Subject: [PATCH] * Use useFromStdenv.

svn path=/nixpkgs/trunk/; revision=6145
---
 pkgs/top-level/all-packages.nix | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3184cacb4d8..1c4999050a6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -78,16 +78,12 @@ rec {
 
   ### BUILD SUPPORT
 
-  /**
-   * Allow the stdenv to determine fetchurl, to cater for strange requirements.
-   */
-  fetchurl =
-    if stdenv ? fetchurl then
-      stdenv.fetchurl
-    else
-      (import ../build-support/fetchurl) {
-        inherit stdenv curl;
-      };
+  # Allow the stdenv to determine fetchurl, to cater for strange
+  # requirements.
+  fetchurl = useFromStdenv (stdenv ? fetchurl) stdenv.fetchurl
+    (import ../build-support/fetchurl {
+      inherit stdenv curl;
+    });
 
   fetchsvn = (import ../build-support/fetchsvn) {
     inherit stdenv subversion nix openssh;