From c3c2e6722113396617da8754ce24518f4bd65e88 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 20 Jan 2020 18:29:31 +0100 Subject: [PATCH] drbd: fix build w/glibc-2.30 Decided to not bump to a later version as they decided to split the repo which would've made change way more complicated. --- pkgs/os-specific/linux/drbd/default.nix | 2 +- .../linux/drbd/fix-glibc-compilation.patch | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/linux/drbd/fix-glibc-compilation.patch diff --git a/pkgs/os-specific/linux/drbd/default.nix b/pkgs/os-specific/linux/drbd/default.nix index 74f3430c2d89..02b8afa721f6 100644 --- a/pkgs/os-specific/linux/drbd/default.nix +++ b/pkgs/os-specific/linux/drbd/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1w4889h1ak7gy9w33kd4fgjlfpgmp6hzfya16p1pkc13bjf22mm0"; }; - patches = [ ./pass-force.patch ]; + patches = [ ./pass-force.patch ./fix-glibc-compilation.patch ]; nativeBuildInputs = [ flex ]; buildInputs = [ perl ]; diff --git a/pkgs/os-specific/linux/drbd/fix-glibc-compilation.patch b/pkgs/os-specific/linux/drbd/fix-glibc-compilation.patch new file mode 100644 index 000000000000..621a2dd995db --- /dev/null +++ b/pkgs/os-specific/linux/drbd/fix-glibc-compilation.patch @@ -0,0 +1,24 @@ +diff --git a/user/drbdadm_adjust.c b/user/drbdadm_adjust.c +index cb23270..3a751ca 100644 +--- a/user/drbdadm_adjust.c ++++ b/user/drbdadm_adjust.c +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + #include + #include + +diff --git a/user/legacy/drbdadm_adjust.c b/user/legacy/drbdadm_adjust.c +index c79163c..6990ffb 100644 +--- a/user/legacy/drbdadm_adjust.c ++++ b/user/legacy/drbdadm_adjust.c +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + #include + #include +