Fixing the nixpkgs tarball, broken for more than a week.

svn path=/nixpkgs/trunk/; revision=26856

pkgs/applications/networking/browsers/firefox/4.0.nix

@@ -11,7 +11,7 @@
   enableOfficialBranding ? false
 }:
 
-assert stdenv.gcc ? libc;
+assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
 
 rec {
 

pkgs/development/guile-modules/guile-lib/default.nix

@@ -1,5 +1,7 @@
 {stdenv, fetchurl, guile, texinfo}:
 
+assert stdenv ? gcc && stdenv.gcc ? gcc && stdenv.gcc.gcc != null;
+
 stdenv.mkDerivation rec {
   name = "guile-lib-0.2.0";
 

pkgs/top-level/all-packages.nix

@@ -6315,7 +6315,7 @@ let
   icecat4Xul =
     (symlinkJoin "icecat-with-xulrunner-${icecat4.version}"
        [ icecat4 icecatXulrunner4 ])
-    // { inherit (icecat4) gtk isFirefox4Like meta; };
+    // { inherit (icecat4) gtk meta; };
 
   icecat4Wrapper = wrapFirefox icecat4Xul "icecat" "";