diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 32c1b3647372..7128f5606193 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -10,8 +10,8 @@ cross: , preConfigure ? "", ... }@args: let - version = "2.24"; - sha256 = "1ghzp41ryvsqxn4rhrm8r25wc33m2jf8zrcc1pj3jxyk8ad9a0by"; + version = "2.25"; + sha256 = "067bd9bb3390e79aa45911537d13c3721f1d9d3769931a30c2681bfee66f23a0"; in assert cross != null -> gccCross != null; @@ -138,7 +138,7 @@ stdenv.mkDerivation ({ lib.optionalString (cross != null) "-${cross.config}"; src = fetchurl { - url = "mirror://gnu/glibc/glibc-${version}.tar.gz"; + url = "mirror://gnu/glibc/glibc-${version}.tar.xz"; inherit sha256; }; diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix index d6c496819da5..12996e1b9221 100644 --- a/pkgs/development/libraries/glibc/default.nix +++ b/pkgs/development/libraries/glibc/default.nix @@ -52,6 +52,7 @@ in # the .so It used to be a symlink, but now it is a script cp -a ${stdenv.cc.cc}/lib/libgcc_s.so $out/lib/libgcc_s.so fi + set -x ''; postInstall = '' @@ -81,7 +82,7 @@ in # to bootstrap-tools; on cross-arm this stripping would break objects. if [ -z "$crossConfig" ]; then for i in "$out"/lib/*.a; do - strip -S "$i" + [ "$i" = "$out/lib/libm.a" ] || strip -S "$i" done fi