From e69fd09023ba0b4f8961906f7e96a92953af2996 Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 5 Apr 2022 16:11:21 +0300 Subject: [PATCH] keyutils: inline patch to improve reproducibility switch to using SOURCE_DATE_EPOCH instead of BUILDDATE --- pkgs/os-specific/linux/keyutils/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/keyutils/default.nix b/pkgs/os-specific/linux/keyutils/default.nix index f307bd56d1cf..88410654f3b3 100644 --- a/pkgs/os-specific/linux/keyutils/default.nix +++ b/pkgs/os-specific/linux/keyutils/default.nix @@ -15,11 +15,6 @@ stdenv.mkDerivation rec { }; patches = [ - (fetchurl { - # improve reproducibility - url = "https://salsa.debian.org/debian/keyutils/raw/4cecffcb8e2a2aa4ef41777ed40e4e4bcfb2e5bf/debian/patches/Make-build-reproducible.patch"; - sha256 = "0wnvbjfrbk7rghd032z684l7vk7mhy3bd41zvhkrhgp3cd5id0bm"; - }) ./conf-symlink.patch # This patch solves a duplicate symbol error when building with a clang stdenv # Before removing this patch, please ensure the package still builds by running eg. @@ -29,9 +24,16 @@ stdenv.mkDerivation rec { makeFlags = lib.optionals stdenv.hostPlatform.isStatic "NO_SOLIB=1"; - BUILDDATE = "1970-01-01"; outputs = [ "out" "lib" "dev" ]; + postPatch = '' + # https://github.com/archlinux/svntogit-packages/blob/packages/keyutils/trunk/reproducible.patch + substituteInPlace Makefile \ + --replace \ + 'VCPPFLAGS := -DPKGBUILD="\"$(shell date -u +%F)\""' \ + 'VCPPFLAGS := -DPKGBUILD="\"$(date -ud "@$SOURCE_DATE_EPOCH" +%F)\""' + ''; + enableParallelBuilding = true; installFlags = [