swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-23 21:55:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

I had changed the gcc-wrapper shell attribute, for it to be a specific kind of

Browse source 
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
This commit is contained in:
Lluís Batlle i Rossell 2010-12-07 15:18:05 +00:00
parent b2ae5a5ba9
commit 43930b36d9
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/build-support/gcc-wrapper/default.nix
View file

@ -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;