Author: viric
Date: Sat Apr 16 16:27:55 2011
New Revision: 26856
URL: https://svn.nixos.org/websvn/nix/?rev=26856&sc=1
Log:
Fixing the nixpkgs tarball, broken for more than a week.
Modified:
nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/4.0.nix
nixpkgs/trunk/pkgs/development/guile-modules/guile-lib/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/4.0.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/4.0.nix Sat Apr
16 11:31:36 2011 (r26855)
+++ nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/4.0.nix Sat Apr
16 16:27:55 2011 (r26856)
@@ -11,7 +11,7 @@
enableOfficialBranding ? false
}:
-assert stdenv.gcc ? libc;
+assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
rec {
Modified: nixpkgs/trunk/pkgs/development/guile-modules/guile-lib/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/guile-modules/guile-lib/default.nix Sat Apr
16 11:31:36 2011 (r26855)
+++ nixpkgs/trunk/pkgs/development/guile-modules/guile-lib/default.nix Sat Apr
16 16:27:55 2011 (r26856)
@@ -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";
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Sat Apr 16 11:31:36
2011 (r26855)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Sat Apr 16 16:27:55
2011 (r26856)
@@ -6315,7 +6315,7 @@
icecat4Xul =
(symlinkJoin "icecat-with-xulrunner-${icecat4.version}"
[ icecat4 icecatXulrunner4 ])
- // { inherit (icecat4) gtk isFirefox4Like meta; };
+ // { inherit (icecat4) gtk meta; };
icecat4Wrapper = wrapFirefox icecat4Xul "icecat" "";
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
