From d8a62e205d4c8f88147bd18068a65b5eba5364e4 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 1 Mar 2023 18:03:33 +0000 Subject: [PATCH] keyutils: fix build for s390 --- pkgs/os-specific/linux/keyutils/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/os-specific/linux/keyutils/default.nix b/pkgs/os-specific/linux/keyutils/default.nix index 88410654f3b3..54622253ed27 100644 --- a/pkgs/os-specific/linux/keyutils/default.nix +++ b/pkgs/os-specific/linux/keyutils/default.nix @@ -20,6 +20,12 @@ stdenv.mkDerivation rec { # Before removing this patch, please ensure the package still builds by running eg. # nix-build -E 'with import ./. {}; pkgs.keyutils.override { stdenv = pkgs.llvmPackages_latest.stdenv; }' ./0001-Remove-unused-function-after_eq.patch + + # Fix build for s390-linux, where size_t is different from ptrdiff_t. + (fetchurl { + url = "https://lore.kernel.org/keyrings/20230301134250.301819-1-hi@alyssa.is/raw"; + sha256 = "1cbgwxq28fw5ldh38ngcs7xiqvpnmrw0hw9zzhbhb1hdxkavrc1s"; + }) ]; makeFlags = lib.optionals stdenv.hostPlatform.isStatic "NO_SOLIB=1";