From 43930b36d9bfdaaa48b751528cf567859dfa1312 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 7 Dec 2010 15:18:05 +0000 Subject: [PATCH] I had changed the gcc-wrapper shell attribute, for it to be a specific kind of derivation instead of a string, but this did not cover all use cases we had. Instead of updating the use cases, I made the wrapper accept also a string. We saw this problem trying to build gcc43_multi. svn path=/nixpkgs/branches/stdenv-updates/; revision=25029 --- pkgs/build-support/gcc-wrapper/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/gcc-wrapper/default.nix b/pkgs/build-support/gcc-wrapper/default.nix index d30bf874506..4e486f8fc64 100644 --- a/pkgs/build-support/gcc-wrapper/default.nix +++ b/pkgs/build-support/gcc-wrapper/default.nix @@ -50,10 +50,12 @@ stdenv.mkDerivation { langAda = if nativeTools then false else gcc ? langAda && gcc.langAda; langVhdl = if nativeTools then false else gcc ? langVhdl && gcc.langVhdl; zlib = if (gcc != null && gcc ? langVhdl) then zlib else null; - shell = if shell == "" then stdenv.shell else shell; + shell = if shell == "" then stdenv.shell else + if builtins.isAttrs shell then (shell + shell.shellPath) + else shell; crossAttrs = { - shell = shell.hostDrv + "${shell.hostDrv.shellPath}"; + shell = shell.hostDrv + shell.hostDrv.shellPath; libc = libc.hostDrv; coreutils = coreutils.hostDrv; binutils = binutils.hostDrv;