From 2768c81adc9d49737162d8c2bef3f3abd1f43f83 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 7 Oct 2022 09:47:08 +0200 Subject: [PATCH] spdk: fix build w/glibc-2.36 Failing Hydra build: https://hydra.nixos.org/build/193339001 --- pkgs/development/libraries/spdk/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/spdk/default.nix b/pkgs/development/libraries/spdk/default.nix index 31f65784061..bcf6b804ed6 100644 --- a/pkgs/development/libraries/spdk/default.nix +++ b/pkgs/development/libraries/spdk/default.nix @@ -55,6 +55,11 @@ in stdenv.mkDerivation rec { postPatch = '' patchShebangs . + + # glibc-2.36 adds arc4random, so we don't need the custom implementation + # here anymore. Fixed upstream in https://github.com/spdk/spdk/commit/43a3984c6c8fde7201d6c8dfe1b680cb88237269, + # but the patch doesn't apply here. + sed -i -e '1i #define HAVE_ARC4RANDOM 1' lib/iscsi/iscsi.c ''; enableParallelBuilding = true;