Fix more gets() problems
This commit is contained in:
parent
80be1c60d5
commit
a893399776
@ -1,6 +1,6 @@
|
|||||||
{ stdenv, fetchurl }:
|
{ stdenv, fetchurl }:
|
||||||
|
|
||||||
stdenv.mkDerivation (rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "gnutar-1.26";
|
name = "gnutar-1.26";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
@ -8,6 +8,12 @@ stdenv.mkDerivation (rec {
|
|||||||
sha256 = "0hbdkzmchq9ycr2x1pxqdcgdbaxksh8c6ac0jf75jajhcks6jlss";
|
sha256 = "0hbdkzmchq9ycr2x1pxqdcgdbaxksh8c6ac0jf75jajhcks6jlss";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [ ./gets-undeclared.patch ];
|
||||||
|
|
||||||
|
# May have some issues with root compilation because the bootstrap tool
|
||||||
|
# cannot be used as a login shell for now.
|
||||||
|
FORCE_UNSAFE_CONFIGURE = stdenv.lib.optionalString (stdenv.system == "armv7l-linux") "1";
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = http://www.gnu.org/software/tar/;
|
homepage = http://www.gnu.org/software/tar/;
|
||||||
description = "GNU implementation of the `tar' archiver";
|
description = "GNU implementation of the `tar' archiver";
|
||||||
@ -33,18 +39,3 @@ stdenv.mkDerivation (rec {
|
|||||||
platforms = stdenv.lib.platforms.all;
|
platforms = stdenv.lib.platforms.all;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
# May have some issues with root compilation because the bootstrap tool
|
|
||||||
# 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 = [ ./gets-undeclared.patch ];
|
|
||||||
});
|
|
||||||
})
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{stdenv, fetchurl, coreutils ? null}:
|
{ stdenv, fetchurl, coreutils ? null }:
|
||||||
|
|
||||||
stdenv.mkDerivation ({
|
stdenv.mkDerivation {
|
||||||
name = "diffutils-3.2";
|
name = "diffutils-3.2";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
@ -8,21 +8,13 @@ stdenv.mkDerivation ({
|
|||||||
sha256 = "1lsf0ln0h3mnm2y0mwgrfk0lyfi7bnm4r886acvdrrsvc7pypaia";
|
sha256 = "1lsf0ln0h3mnm2y0mwgrfk0lyfi7bnm4r886acvdrrsvc7pypaia";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [ ../../misc/coreutils/gets-undeclared.patch ];
|
||||||
|
|
||||||
/* If no explicit coreutils is given, use the one from stdenv. */
|
/* If no explicit coreutils is given, use the one from stdenv. */
|
||||||
buildNativeInputs = [coreutils];
|
buildNativeInputs = [ coreutils ];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = http://www.gnu.org/software/diffutils/diffutils.html;
|
homepage = http://www.gnu.org/software/diffutils/diffutils.html;
|
||||||
description = "Commands for showing the differences between files (diff, cmp, etc.)";
|
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 ];
|
|
||||||
});
|
|
||||||
})
|
|
||||||
|
Loading…
Reference in New Issue
Block a user