public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Filter out the meta attribute.

Browse Source 
svn path=/nixpkgs/trunk/; revision=5091
This commit is contained in:
Eelco Dolstra 2006-03-24 14:20:31 +00:00
parent 09a9cae715
commit bb28c87406
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/build-support/gcc-wrapper/default.nix
View File

@ -27,7 +27,7 @@ stdenv.mkDerivation {
langCC = if nativeTools then true else gcc.langCC; langCC = if nativeTools then true else gcc.langCC;
langF77 = if nativeTools then false else gcc.langF77; langF77 = if nativeTools then false else gcc.langF77;
shell = if shell == "" then stdenv.shell else shell; shell = if shell == "" then stdenv.shell else shell;
meta = if gcc != null then gcc.meta else meta = if gcc != null && (gcc ? meta) then gcc.meta else
{ description = "System C compiler wrapper"; { description = "System C compiler wrapper";
}; };
} }

2
pkgs/stdenv/linux/default.nix
View File

@ -101,7 +101,7 @@ rec {
args = ./scripts/builder-stdenv-initial.sh; args = ./scripts/builder-stdenv-initial.sh;
inherit staticTools; inherit staticTools;
} // { } // {
mkDerivation = attrs: derivation (attrs // { mkDerivation = attrs: derivation ((removeAttrs attrs ["meta"]) // {
builder = ./tools/bash; builder = ./tools/bash;
args = ["-e" attrs.builder]; args = ["-e" attrs.builder];
stdenv = body; stdenv = body;