diff --git a/pkgs/development/libraries/glibc-2.8/default.nix b/pkgs/development/libraries/glibc-2.8/default.nix index ca86a9527d7..6f39ebbf8d4 100644 --- a/pkgs/development/libraries/glibc-2.8/default.nix +++ b/pkgs/development/libraries/glibc-2.8/default.nix @@ -3,14 +3,14 @@ , profilingLibraries ? false }: -stdenv.mkDerivation rec -{ - name = "glibc-2.8-20080707"; +stdenv.mkDerivation rec { + name = "glibc-2.8-20081006"; + builder = ./builder.sh; - src = fetchurl - { + + src = fetchurl { url = "ftp://sources.redhat.com/pub/glibc/snapshots/${name}.tar.bz2"; - sha256 = "e317b854807f52cd539ed9b6bf8b1c2977e650e27e90baa787444bd3b74f5e72"; + sha256 = "e32021c14f0bda55b6a5d2a98ac878a03b2c6f78a1ab4a11f0386a51eda1d58e"; }; inherit kernelHeaders installLocales; @@ -45,9 +45,11 @@ stdenv.mkDerivation rec # `--with-tls --without-__thread' enables support for TLS but causes # it not to be used. Required if we don't want to barf on 2.4 # kernels. Or something. - configureFlags="--enable-add-ons + configureFlags = '' + --enable-add-ons --with-headers=${kernelHeaders}/include - ${if profilingLibraries then "--enable-profile" else "--disable-profile"}"; + ${if profilingLibraries then "--enable-profile" else "--disable-profile"} + ''; # Workaround for this bug: # http://sourceware.org/bugzilla/show_bug.cgi?id=411 @@ -55,4 +57,9 @@ stdenv.mkDerivation rec # preprocessor symbol `__i686' will be defined to `1'. This causes # the symbol __i686.get_pc_thunk.dx to be mangled. NIX_CFLAGS_COMPILE = "-U__i686"; + + meta = { + homepage = http://www.gnu.org/software/libc/; + description = "The GNU C Library"; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 16b6a9f1c73..b93855cabd0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2806,16 +2806,17 @@ let inherit fetchurl stdenv pkgconfig gettext; }; - glibc = useFromStdenv "glibc" - (import ../development/libraries/glibc-2.7 { - inherit fetchurl stdenv kernelHeaders; - #installLocales = false; - }); + glibc = useFromStdenv "glibc" glibc28; - glibcUnstable = lowPrio (import ../development/libraries/glibc-2.8 { - inherit fetchurl stdenv kernelHeaders; - installLocales = getPkgConfig "glibc" "locales" false; - }); + glibc27 = import ../development/libraries/glibc-2.7 { + inherit fetchurl stdenv kernelHeaders; + #installLocales = false; + }; + + glibc28 = import ../development/libraries/glibc-2.8 { + inherit fetchurl stdenv kernelHeaders; + installLocales = getPkgConfig "glibc" "locales" false; + }; glibc_multi = assert system == "x86_64-linux";