Author: eelco
Date: Mon Dec 6 14:25:58 2010
New Revision: 25003
URL: https://svn.nixos.org/websvn/nix/?rev=25003&sc=1
Log:
* Fix the GRUB 1 build on x86_64-linux. It didn't build because
gcc43_multi is broken in the stdenv branch. However, for GRUB 1 we
can just use the 32-bit build of GRUB (using callPackage_i686).
Modified:
nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
Modified: nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Mon Dec
6 14:04:20 2010 (r25002)
+++ nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Mon Dec
6 14:25:58 2010 (r25003)
@@ -725,10 +725,8 @@
ghostscript = null;
};
- grub = import ../tools/misc/grub {
- inherit fetchurl autoconf automake;
- stdenv = stdenv_32bit;
- buggyBiosCDSupport = (getConfig ["grub" "buggyBiosCDSupport"] true);
+ grub = callPackage_i686 ../tools/misc/grub {
+ buggyBiosCDSupport = getConfig ["grub" "buggyBiosCDSupport"] true;
};
grub2 = callPackage ../tools/misc/grub/1.9x.nix { };
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
