From eabd03a551bcc830f73a04dace21122c04b49922 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Sat, 18 Sep 2021 06:37:20 +0200 Subject: [PATCH] systemd: fix cross-compilation Instead of patching the ld path, it's now specified as meson option --- pkgs/os-specific/linux/systemd/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 9f92c34cee6b..e0a4128b0cdc 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -183,9 +183,6 @@ stdenv.mkDerivation { postPatch = '' substituteInPlace src/basic/path-util.h --replace "@defaultPathNormal@" "${placeholder "out"}/bin/" substituteInPlace src/boot/efi/meson.build \ - --replace \ - "find_program('ld'" \ - "find_program('${stdenv.cc.bintools.targetPrefix}ld'" \ --replace \ "find_program('objcopy'" \ "find_program('${stdenv.cc.bintools.targetPrefix}objcopy'" @@ -408,6 +405,7 @@ stdenv.mkDerivation { "-Dsmack=true" "-Db_pie=true" "-Dinstall-sysconfdir=false" + "-Defi-ld=${stdenv.cc.bintools.targetPrefix}ld" /* As of now, systemd doesn't allow runtime configuration of these values. So the settings in /etc/login.defs have no effect on it. Many people think this