glibc: 2.23 -> 2.24

- Removed patches that were merged upstream
- Removed --localdir from configureFlags as according to
  https://sourceware.org/bugzilla/show_bug.cgi?id=14259
  it was unused before
This commit is contained in:
obadz
2016-08-19 15:05:41 +01:00
parent 081ac25dc6
commit 9744c7768d
6 changed files with 2 additions and 850 deletions
+2 -10
View File
@@ -10,9 +10,8 @@ cross:
, preConfigure ? "", ... }@args:
let
version = "2.23";
sha256 = "1lk9a8jv5kyx8hp0wmfzjyk047q95ybyjqbyw5idl7414jxqml1b";
version = "2.24";
sha256 = "1ghzp41ryvsqxn4rhrm8r25wc33m2jf8zrcc1pj3jxyk8ad9a0by";
in
assert cross != null -> gccCross != null;
@@ -49,12 +48,6 @@ stdenv.mkDerivation ({
"/bin:/usr/bin", which is inappropriate on NixOS machines. This
patch extends the search path by "/run/current-system/sw/bin". */
./fix_path_attribute_in_getconf.patch
./cve-2016-3075.patch
./glob-simplify-interface.patch
./cve-2016-1234.patch
./cve-2016-3706.patch
./fix_warnings.patch
];
postPatch =
@@ -89,7 +82,6 @@ stdenv.mkDerivation ({
"--enable-add-ons"
"--enable-obsolete-rpc"
"--sysconfdir=/etc"
"--localedir=/var/run/current-system/sw/lib/locale"
"libc_cv_ssp=no"
(if linuxHeaders != null
then "--with-headers=${linuxHeaders}/include"