* Use useFromStdenv.
svn path=/nixpkgs/trunk/; revision=6145
This commit is contained in:
parent
77a5272922
commit
deaacb7a0f
@ -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;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user