nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 07:53:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge: glibc: 2.24 -> 2.25

Browse Source
This commit is contained in:
Vladimír Čunát 2017-02-13 22:12:55 +01:00
commit 1daf2e26d2
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
4 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/libraries/fontconfig/default.nix
View File

@ -28,7 +28,16 @@ stdenv.mkDerivation rec {
src = ./config-compat.patch;
inherit configVersion;
})
(fetchpatch {
name = "glibc-2.25.diff";
url = "https://cgit.freedesktop.org/fontconfig/patch/?id=1ab5258f7c";
sha256 = "0x2a4qx51j3gqcp1kp4lisdzmhrkw1zw0r851d82ksgjlc0vkbaz";
})
];
# additionally required for the glibc-2.25 patch
postPatch = ''
sed s/CHAR_WIDTH/CHARWIDTH/g -i src/fcobjshash.{h,gperf}
'';
outputs = [ "bin" "dev" "lib" "out" ]; # $out contains all the config

6
pkgs/development/libraries/glibc/common.nix
View File

@ -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;
};

2
pkgs/development/libraries/glibc/default.nix
View File

@ -81,7 +81,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

3
pkgs/tools/misc/findutils/default.nix
View File

@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ coreutils ];
doCheck = !stdenv.isDarwin;
# Since glibc-2.25 the i686 tests hang reliably right after test-sleep.
doCheck = !stdenv.isDarwin && (stdenv.system != "i686-linux");
outputs = [ "out" "info" ];