diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2012-03-07 22:15:42 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2012-03-07 22:15:42 +0000 |
| commit | 330a4e656af7309aad3f956862cac25f6afc578c (patch) | |
| tree | 5ef44c75b9cdb4bdf4bf127a3c34ed496cfeadf2 /pkgs/os-specific/linux | |
| parent | f1f834f26091c39a10fc09078d93651afeb031cf (diff) | |
| download | nixpkgs-330a4e656af7309aad3f956862cac25f6afc578c.tar nixpkgs-330a4e656af7309aad3f956862cac25f6afc578c.tar.gz nixpkgs-330a4e656af7309aad3f956862cac25f6afc578c.tar.bz2 nixpkgs-330a4e656af7309aad3f956862cac25f6afc578c.tar.lz nixpkgs-330a4e656af7309aad3f956862cac25f6afc578c.tar.xz nixpkgs-330a4e656af7309aad3f956862cac25f6afc578c.tar.zst nixpkgs-330a4e656af7309aad3f956862cac25f6afc578c.zip | |
util-linux: Use Linux-specific header on Linux only.
svn path=/nixpkgs/trunk/; revision=32867
Diffstat (limited to 'pkgs/os-specific/linux')
| -rw-r--r-- | pkgs/os-specific/linux/util-linux/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/util-linux/linux-specific-header.patch | 16 |
2 files changed, 18 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index de49fe5182a..124b95ee04c 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1q5vjcvw4f067c63vj2n3xggvk5prm11571x6vnqiav47vdbqvni"; }; + patches = [ ./linux-specific-header.patch ]; + crossAttrs = { # Work around use of `AC_RUN_IFELSE'. preConfigure = "export scanf_cv_type_modifier=ms"; diff --git a/pkgs/os-specific/linux/util-linux/linux-specific-header.patch b/pkgs/os-specific/linux/util-linux/linux-specific-header.patch new file mode 100644 index 00000000000..8d0b57dea3f --- /dev/null +++ b/pkgs/os-specific/linux/util-linux/linux-specific-header.patch @@ -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" + |