* Use useFromStdenv.

svn path=/nixpkgs/trunk/; revision=6145
This commit is contained in:
Eelco Dolstra 2006-08-17 08:49:13 +00:00
parent 77a5272922
commit deaacb7a0f

View File

@ -78,16 +78,12 @@ rec {
### BUILD SUPPORT ### BUILD SUPPORT
/** # Allow the stdenv to determine fetchurl, to cater for strange
* Allow the stdenv to determine fetchurl, to cater for strange requirements. # requirements.
*/ fetchurl = useFromStdenv (stdenv ? fetchurl) stdenv.fetchurl
fetchurl = (import ../build-support/fetchurl {
if stdenv ? fetchurl then inherit stdenv curl;
stdenv.fetchurl });
else
(import ../build-support/fetchurl) {
inherit stdenv curl;
};
fetchsvn = (import ../build-support/fetchsvn) { fetchsvn = (import ../build-support/fetchsvn) {
inherit stdenv subversion nix openssh; inherit stdenv subversion nix openssh;