diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2020-01-19 22:39:04 +0100 |
|---|---|---|
| committer | Maximilian Bosch <maximilian@mbosch.me> | 2020-01-23 00:21:21 +0100 |
| commit | e7b6039d0c04c0feea29ccb7c9386a16508733b1 (patch) | |
| tree | 43daa4228909fa92c2a0f9b23437ed63dfba487a /pkgs/tools/networking/xnbd | |
| parent | 2df926d9a656a918ffb8754983d56d09fea2f946 (diff) | |
| download | nixpkgs-e7b6039d0c04c0feea29ccb7c9386a16508733b1.tar nixpkgs-e7b6039d0c04c0feea29ccb7c9386a16508733b1.tar.gz nixpkgs-e7b6039d0c04c0feea29ccb7c9386a16508733b1.tar.bz2 nixpkgs-e7b6039d0c04c0feea29ccb7c9386a16508733b1.tar.lz nixpkgs-e7b6039d0c04c0feea29ccb7c9386a16508733b1.tar.xz nixpkgs-e7b6039d0c04c0feea29ccb7c9386a16508733b1.tar.zst nixpkgs-e7b6039d0c04c0feea29ccb7c9386a16508733b1.zip | |
xnbd: fix build w/glibc-2.30
Diffstat (limited to 'pkgs/tools/networking/xnbd')
| -rw-r--r-- | pkgs/tools/networking/xnbd/0001-Fix-build-for-glibc-2.28.patch | 25 | ||||
| -rw-r--r-- | pkgs/tools/networking/xnbd/default.nix | 2 |
2 files changed, 27 insertions, 0 deletions
diff --git a/pkgs/tools/networking/xnbd/0001-Fix-build-for-glibc-2.28.patch b/pkgs/tools/networking/xnbd/0001-Fix-build-for-glibc-2.28.patch new file mode 100644 index 00000000000..712183e56c7 --- /dev/null +++ b/pkgs/tools/networking/xnbd/0001-Fix-build-for-glibc-2.28.patch @@ -0,0 +1,25 @@ +From e799a7e0a64696e4ef6c088d36e4db09f8323581 Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch <maximilian@mbosch.me> +Date: Sun, 19 Jan 2020 22:37:04 +0100 +Subject: [PATCH] Fix build for glibc>=2.28 + +The major/minor macros are defined in <sys/sysmacros.h> now. +--- + lib/io.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/lib/io.h b/lib/io.h +index 8703cc8..e3d0d10 100644 +--- a/lib/io.h ++++ b/lib/io.h +@@ -33,6 +33,7 @@ + #include <sys/types.h> + #include <sys/stat.h> + #include <sys/mman.h> ++#include <sys/sysmacros.h> + + + void read_all(int fd, void *buf, size_t len); +-- +2.23.1 + diff --git a/pkgs/tools/networking/xnbd/default.nix b/pkgs/tools/networking/xnbd/default.nix index e898904c6d4..a874565684f 100644 --- a/pkgs/tools/networking/xnbd/default.nix +++ b/pkgs/tools/networking/xnbd/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { sourceRoot = "${name}/trunk"; + patches = [ ./0001-Fix-build-for-glibc-2.28.patch ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ glib jansson ]; |