mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-19 15:11:30 +00:00
systemd: Fix path to find_program('clang', ...) replacement; substituteInPlace --replace-fail everywhere (#540766)
This commit is contained in:
@@ -245,18 +245,18 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/basic/path-util.h --replace "@defaultPathNormal@" "${placeholder "out"}/bin/"
|
||||
substituteInPlace src/basic/path-util.h --replace-fail "@defaultPathNormal@" "${placeholder "out"}/bin/"
|
||||
''
|
||||
+ lib.optionalString withLibBPF ''
|
||||
substituteInPlace meson.build \
|
||||
--replace "find_program('clang'" "find_program('${stdenv.cc.targetPrefix}clang'"
|
||||
substituteInPlace src/bpf/meson.build \
|
||||
--replace-fail "find_program('clang'" "find_program('${stdenv.cc.targetPrefix}clang'"
|
||||
''
|
||||
+ lib.optionalString withUkify ''
|
||||
substituteInPlace src/ukify/ukify.py \
|
||||
--replace \
|
||||
--replace-fail \
|
||||
"'readelf'" \
|
||||
"'${targetPackages.stdenv.cc.bintools.targetPrefix}readelf'" \
|
||||
--replace \
|
||||
--replace-fail \
|
||||
"/usr/lib/systemd/boot/efi" \
|
||||
"$out/lib/systemd/boot/efi"
|
||||
''
|
||||
@@ -580,7 +580,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
preConfigure = ''
|
||||
substituteInPlace src/libsystemd/sd-journal/catalog.c \
|
||||
--replace /usr/lib/systemd/catalog/ $out/lib/systemd/catalog/
|
||||
--replace-fail /usr/lib/systemd/catalog/ $out/lib/systemd/catalog/
|
||||
'';
|
||||
|
||||
# These defines are overridden by CFLAGS and would trigger annoying
|
||||
@@ -628,7 +628,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
# Fix reference to /bin/false in the D-Bus services.
|
||||
for i in $out/share/dbus-1/system-services/*.service; do
|
||||
substituteInPlace $i --replace /bin/false ${coreutils}/bin/false
|
||||
substituteInPlace $i --replace-fail /bin/false ${coreutils}/bin/false
|
||||
done
|
||||
|
||||
# For compatibility with dependents that use sbin instead of bin.
|
||||
|
||||
Reference in New Issue
Block a user