From b59847b848079ba872e18b5f0683c1bff7e924ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 8 Jun 2020 06:27:16 +0200 Subject: [PATCH] systemd: avoid rebuild from the parent commit for now Otherwise we'd be delaying this staging-next cycle noticeably. --- pkgs/os-specific/linux/systemd/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 3235fb3b95cd..722b4db9a80a 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -66,6 +66,9 @@ in stdenv.mkDerivation { postPatch = '' substituteInPlace src/basic/path-util.h --replace "@defaultPathNormal@" "${placeholder "out"}/bin/" + '' + # TODO: unconditionalize on the next rebuild + + stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' substituteInPlace src/boot/efi/meson.build \ --replace \ "find_program('ld'" \