* Filter out the meta attribute.
svn path=/nixpkgs/trunk/; revision=5091
This commit is contained in:
parent
09a9cae715
commit
bb28c87406
@ -27,7 +27,7 @@ stdenv.mkDerivation {
|
||||
langCC = if nativeTools then true else gcc.langCC;
|
||||
langF77 = if nativeTools then false else gcc.langF77;
|
||||
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";
|
||||
};
|
||||
}
|
||||
}
|
@ -101,7 +101,7 @@ rec {
|
||||
args = ./scripts/builder-stdenv-initial.sh;
|
||||
inherit staticTools;
|
||||
} // {
|
||||
mkDerivation = attrs: derivation (attrs // {
|
||||
mkDerivation = attrs: derivation ((removeAttrs attrs ["meta"]) // {
|
||||
builder = ./tools/bash;
|
||||
args = ["-e" attrs.builder];
|
||||
stdenv = body;
|
||||
|
Loading…
Reference in New Issue
Block a user