Merging from trunk.

svn path=/nixpkgs/branches/stdenv-updates2/; revision=18280
This commit is contained in:
Lluís Batlle i Rossell 2009-11-08 02:03:13 +00:00
parent 4326d07c11
commit 5eeac0d52a

View file

@ -10,7 +10,7 @@ stdenv.mkDerivation {
outputHashMode = "recursive";
outputHash = if sha256 == "" then md5 else sha256;
inherit url rev depth;
inherit url rev;
impureEnvVars = [
# We borrow these environment variables from the caller to allow