From 229ecd4bbc6f739578d9fc1ec4ed0ea1ceb74397 Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 21 Jul 2022 05:00:18 +0300 Subject: [PATCH] systemd: update substituteInPlace to restore cross systemd-aarch64-unknown-linux-gnu> src/boot/efi/meson.build:433:8: ERROR: Program 'objcopy' not found or not executable --- pkgs/os-specific/linux/systemd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 48baed6615ea..31b771433924 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -211,8 +211,8 @@ stdenv.mkDerivation { substituteInPlace src/basic/path-util.h --replace "@defaultPathNormal@" "${placeholder "out"}/bin/" substituteInPlace src/boot/efi/meson.build \ --replace \ - "find_program('objcopy'" \ - "find_program('${stdenv.cc.bintools.targetPrefix}objcopy'" + "run_command(cc.cmd_array(), '-print-prog-name=objcopy', check: true).stdout().strip()" \ + "'${stdenv.cc.bintools.targetPrefix}objcopy'" '' + ( let # The following patches references to dynamic libraries to ensure that