* Filter out the meta attribute.
svn path=/nixpkgs/trunk/; revision=5091
commitbb28c8740650a2ecbbc98d088348b5f36b29d2f5
authorEelco Dolstra <eelco.dolstra@logicblox.com>
dateFri 24 Mar 2006, 14:20 (21 years ago)
parent09a9cae
pkgs/build-support/gcc-wrapper/default.nix+2−2
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
2727 langCC = if nativeTools then true else gcc.langCC;
2828 langF77 = if nativeTools then false else gcc.langF77;
2929 shell = if shell == "" then stdenv.shell else shell;
30− meta = if gcc != null then gcc.meta else
30+ meta = if gcc != null && (gcc ? meta) then gcc.meta else
3131 { description = "System C compiler wrapper";
3232 };
33−}
33+}
pkgs/stdenv/linux/default.nix+1−1
@@ -101,7 +101,7 @@ rec {
101101 args = ./scripts/builder-stdenv-initial.sh;
102102 inherit staticTools;
103103 } // {
104− mkDerivation = attrs: derivation (attrs // {
104+ mkDerivation = attrs: derivation ((removeAttrs attrs ["meta"]) // {
105105 builder = ./tools/bash;
106106 args = ["-e" attrs.builder];
107107 stdenv = body;