From 4497215410f169a58a593ef2e90fb0517b78ac55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 20 Nov 2009 12:33:43 +0000 Subject: [PATCH] Allowing in the cross stdenv adapter the calls to mkDerivation without name. I don't know why there are such calls, but there are. svn path=/nixpkgs/branches/stdenv-updates/; revision=18482 --- pkgs/stdenv/adapters.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index f6939f57e62..011bede0d54 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -110,7 +110,7 @@ rec { # Return a modified stdenv that adds a cross compiler to the # builds. makeStdenvCross = stdenv: cross: binutilsCross: gccCross: stdenv // - { mkDerivation = {name, buildInputs ? [], buildNativeInputs ? [], + { mkDerivation = {name ? "", buildInputs ? [], buildNativeInputs ? [], propagatedBuildInputs ? [], propagatedBuildNativeInputs ? [], ...}@args: let # *BuildInputs exists temporarily as another name for