mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-21 13:10:33 +00:00
Code Issues Wiki Activity

util-linux: Use Linux-specific header on Linux only.

Browse source 
svn path=/nixpkgs/trunk/; revision=32867
This commit is contained in:
Ludovic Courtès 2012-03-07 22:15:42 +00:00
parent f1f834f260
commit 330a4e656a
2 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/os-specific/linux/util-linux/default.nix
View file

@ -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";

16
pkgs/os-specific/linux/util-linux/linux-specific-header.patch Normal file
View file

@ -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"