about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorLinus Heckemann <git@sphalerite.org>2023-12-12 17:56:06 +0100
committerGitHub <noreply@github.com>2023-12-12 17:56:06 +0100
commitfecc1aadc5f869127f45fe8121f5fcbba493cbc3 (patch)
tree154513d92301e5bda82bfd7302ce4b8a14fcfd03 /pkgs
parent076fc3ad3158bdf0b04374570dfaa30fd0aaf9a9 (diff)
parent9e7e41c43d6ba72feadeca221af48a968d016068 (diff)
downloadnixlib-fecc1aadc5f869127f45fe8121f5fcbba493cbc3.tar
nixlib-fecc1aadc5f869127f45fe8121f5fcbba493cbc3.tar.gz
nixlib-fecc1aadc5f869127f45fe8121f5fcbba493cbc3.tar.bz2
nixlib-fecc1aadc5f869127f45fe8121f5fcbba493cbc3.tar.lz
nixlib-fecc1aadc5f869127f45fe8121f5fcbba493cbc3.tar.xz
nixlib-fecc1aadc5f869127f45fe8121f5fcbba493cbc3.tar.zst
nixlib-fecc1aadc5f869127f45fe8121f5fcbba493cbc3.zip
Merge pull request #273535 from lheckemann/ukify-stub-path-fix
systemd: fix path to stubs in ukify
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/os-specific/linux/systemd/default.nix5
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 87db00c618be..afb10b3c2fcb 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -246,7 +246,10 @@ stdenv.mkDerivation (finalAttrs: {
     substituteInPlace src/ukify/ukify.py \
       --replace \
       "'readelf'" \
-      "'${targetPackages.stdenv.cc.bintools.targetPrefix}readelf'"
+      "'${targetPackages.stdenv.cc.bintools.targetPrefix}readelf'" \
+      --replace \
+      "/usr/lib/systemd/boot/efi" \
+      "$out/lib/systemd/boot/efi"
   '' + (
     let
       # The following patches references to dynamic libraries to ensure that