Author: ludo
Date: Wed Mar 7 22:15:42 2012
New Revision: 32867
URL: https://nixos.org/websvn/nix/?rev=32867&sc=1
Log:
util-linux: Use Linux-specific header on Linux only.
Added:
nixpkgs/trunk/pkgs/os-specific/linux/util-linux/linux-specific-header.patch
Modified:
nixpkgs/trunk/pkgs/os-specific/linux/util-linux/default.nix
Modified: nixpkgs/trunk/pkgs/os-specific/linux/util-linux/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/os-specific/linux/util-linux/default.nix Wed Mar 7
22:12:12 2012 (r32866)
+++ nixpkgs/trunk/pkgs/os-specific/linux/util-linux/default.nix Wed Mar 7
22:15:42 2012 (r32867)
@@ -10,6 +10,8 @@
sha256 = "1q5vjcvw4f067c63vj2n3xggvk5prm11571x6vnqiav47vdbqvni";
};
+ patches = [ ./linux-specific-header.patch ];
+
crossAttrs = {
# Work around use of `AC_RUN_IFELSE'.
preConfigure = "export scanf_cv_type_modifier=ms";
Added:
nixpkgs/trunk/pkgs/os-specific/linux/util-linux/linux-specific-header.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/os-specific/linux/util-linux/linux-specific-header.patch
Wed Mar 7 22:15:42 2012 (r32867)
@@ -0,0 +1,16 @@
+The <asm/param.h> header is Linux-only and breaks GNU/Hurd builds.
+
+--- util-linux-2.20.1/term-utils/write.c 2012-03-07 23:06:14.000000000
+0100
++++ util-linux-2.20.1/term-utils/write.c 2012-03-07 23:06:19.000000000
+0100
+@@ -57,7 +57,9 @@
+ #include <sys/param.h>
+ #include <sys/stat.h>
+ #include <paths.h>
+-#include <asm/param.h>
++#ifdef __linux__
++# include <asm/param.h>
++#endif
+ #include <getopt.h>
+ #include "c.h"
+ #include "carefulputc.h"
+
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
