JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tar, gzip, diffutils: Allow builds with newer versions of glibc.

Browse Source 
This is a follow-up to 77fdc7bb35 ("GNU
Coreutils: Allow builds with newer versions of glibc.").
This commit is contained in:
Ludovic Courtès 2012-07-01 01:14:43 +02:00
parent 81baf55892
commit 9786a98261
3 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/tools/archivers/gnutar/default.nix
View File

@ -37,4 +37,14 @@ stdenv.mkDerivation (rec {
# cannot be used as a login shell for now.
// stdenv.lib.optionalAttrs (stdenv.system == "armv7l-linux") {
FORCE_UNSAFE_CONFIGURE = 1;
}
//
{
crossAttrs =
# XXX: Temporary workaround to allow GNU/Hurd builds with newer libcs.
(stdenv.lib.optionalAttrs (stdenv.cross.config == "i586-pc-gnu") {
patches = [ ../../misc/coreutils/gets-undeclared.patch ];
});
})

12
pkgs/tools/compression/gzip/default.nix
View File

@ -1,6 +1,6 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (rec {
name = "gzip-1.4";
src = fetchurl {
@ -31,3 +31,13 @@ stdenv.mkDerivation rec {
maintainers = [ stdenv.lib.maintainers.ludo ];
};
}
//
{
crossAttrs =
# XXX: Temporary workaround to allow GNU/Hurd builds with newer libcs.
(stdenv.lib.optionalAttrs (stdenv.cross.config == "i586-pc-gnu") {
patches = [ ../../misc/coreutils/gets-undeclared.patch ];
});
})

12
pkgs/tools/text/diffutils/default.nix
View File

@ -1,6 +1,6 @@
{stdenv, fetchurl, coreutils ? null}:
stdenv.mkDerivation {
stdenv.mkDerivation ({
name = "diffutils-3.2";
src = fetchurl {
@ -16,3 +16,13 @@ stdenv.mkDerivation {
description = "Commands for showing the differences between files (diff, cmp, etc.)";
};
}
//
{
crossAttrs =
# XXX: Temporary workaround to allow GNU/Hurd builds with newer libcs.
(stdenv.lib.optionalAttrs (stdenv.cross.config == "i586-pc-gnu") {
patches = [ ../../misc/coreutils/gets-undeclared.patch ];
});
})