diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-04-04 21:33:05 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-04-04 21:33:55 +0200 |
| commit | 10147beecfbef6d1029650a854e5f53827f7deca (patch) | |
| tree | 1cdd7cabab0eb564110b92cf944e30bb79ab4ac2 /pkgs/tools | |
| parent | 4ab58240a9c5cf977767965d978a8f6bb7127f41 (diff) | |
| parent | 685d5a02a23a6fa52a82a79f3ec27d659c5a8a3f (diff) | |
| download | nixlib-10147beecfbef6d1029650a854e5f53827f7deca.tar nixlib-10147beecfbef6d1029650a854e5f53827f7deca.tar.gz nixlib-10147beecfbef6d1029650a854e5f53827f7deca.tar.bz2 nixlib-10147beecfbef6d1029650a854e5f53827f7deca.tar.lz nixlib-10147beecfbef6d1029650a854e5f53827f7deca.tar.xz nixlib-10147beecfbef6d1029650a854e5f53827f7deca.tar.zst nixlib-10147beecfbef6d1029650a854e5f53827f7deca.zip | |
Merge branch vcunat@NixOS:p/stdenv (close #1840)
This branch contains a collection of stdenv-changing updates. There's glibc 2.18 -> .19 bump and many non-intrusive PRs. The grsecurity branch #1187 got removed at Eelco's request, see https://github.com/NixOS/nixpkgs/issues/1840#issuecomment-39327023
Diffstat (limited to 'pkgs/tools')
4 files changed, 26 insertions, 2 deletions
diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix index 16e836e2ddc2..dcbf7235e49c 100644 --- a/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { }; # libuuid, libblkid, uuidd and fsck are in util-linux-ng (the "libuuid" dependency). - configureFlags = "--enable-elf-shlibs --disable-libuuid --disable-libblkid --disable-uuidd --disable-fsck"; + configureFlags = "--enable-elf-shlibs --disable-libuuid --disable-libblkid --disable-uuidd --disable-fsck --enable-symlink-install"; enableParallelBuilding = true; diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index e5f9eb1be2c0..b0dbb049cbf7 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -58,7 +58,9 @@ let # and {Open,Free}BSD. doCheck = stdenv ? glibc; - enableParallelBuilding = true; + # Saw random failures like ‘help2man: can't get '--help' info from + # man/sha512sum.td/sha512sum’. + enableParallelBuilding = false; NIX_LDFLAGS = optionalString selinuxSupport "-lsepol"; diff --git a/pkgs/tools/package-management/checkinstall/default.nix b/pkgs/tools/package-management/checkinstall/default.nix index 2fbf5282ee12..1320720ed170 100644 --- a/pkgs/tools/package-management/checkinstall/default.nix +++ b/pkgs/tools/package-management/checkinstall/default.nix @@ -29,6 +29,9 @@ stdenv.mkDerivation { # Fix a `conflicting types for 'scandir'' error on Glibc 2.11. ./scandir.patch + + # Fix a `conflicting types for 'readlink'' error since Glibc 2.19 + ./readlink-types.patch ] ++ stdenv.lib.optional (stdenv.system == "x86_64-linux") diff --git a/pkgs/tools/package-management/checkinstall/readlink-types.patch b/pkgs/tools/package-management/checkinstall/readlink-types.patch new file mode 100644 index 000000000000..a860607fcf66 --- /dev/null +++ b/pkgs/tools/package-management/checkinstall/readlink-types.patch @@ -0,0 +1,19 @@ +Extracted from Arch's patch +https://projects.archlinux.org/svntogit/community.git/tree/trunk/build-fix.patch?h=packages/checkinstall +diff -wbBur checkinstall-1.6.2/installwatch/installwatch.c checkinstall-1.6.2.my/installwatch/installwatch.c +--- checkinstall-1.6.2/installwatch/installwatch.c 2008-11-16 19:20:53.000000000 +0300 ++++ checkinstall-1.6.2.my/installwatch/installwatch.c 2010-01-15 18:55:50.112716628 +0300 +@@ -2938,13 +2938,8 @@ + return result; + } + +-#if (GLIBC_MINOR <= 4) +-int readlink(const char *path,char *buf,size_t bufsiz) { +- int result; +-#else + ssize_t readlink(const char *path,char *buf,size_t bufsiz) { + ssize_t result; +-#endif + instw_t instw; + int status; + |