Author: rob
Date: Tue May 3 07:39:45 2011
New Revision: 27103
URL: https://svn.nixos.org/websvn/nix/?rev=27103&sc=1
Log:
disable glibc for now in gnu-on-linux job
Modified:
hydra-config/gnu/trunk/release.nix
Modified: hydra-config/gnu/trunk/release.nix
==============================================================================
--- hydra-config/gnu/trunk/release.nix Tue May 3 07:31:02 2011 (r27102)
+++ hydra-config/gnu/trunk/release.nix Tue May 3 07:39:45 2011 (r27103)
@@ -25,7 +25,7 @@
, nixos ? { outPath = ../nixos; rev = 0; }
/* Source tarballs of the latest GNU packages. */
-, glibc ? (import glibc/release.nix {}).tarball {}
+#, glibc ? (import glibc/release.nix {}).tarball {}
, coreutils ? (import coreutils/release.nix {}).tarball {}
, cpio ? (import cpio/release.nix {}).tarball {}
, guile ? (import guile/release.nix {}).tarball {}
@@ -55,9 +55,10 @@
'';
});
- glibcNew = glibc;
+# glibcNew = glibc;
in
{
+ /*
# The bootstrap tools on x86_64 contain an old version of GNU as,
# which doesn't support `gnu_indirect_function', leading to a build
# failure when multi-arch support is enabled. Thus, build with
@@ -71,6 +72,7 @@
configureFlags = origPkgs.glibc.configureFlags ++ [
"--disable-multi-arch" ];
preUnpack = '' src="$(echo $src/tarballs/*.bz2)" '';
});
+ */
coreutils = override "coreutils" origPkgs.coreutils coreutils;
cpio = override "cpio" origPkgs.cpio cpio;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
