about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorJulien Malka <julien@malka.sh>2024-01-27 01:27:51 +0000
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2024-01-27 05:58:46 +0000
commit261582f076045e4115c5d6031dcc9719df9947f8 (patch)
tree2c93e2e9f0d6f19f54bdd8024389eb095e3c7137 /nixos
parent9658699e3ab26e6f499c95e2e9093819cac777b3 (diff)
nixos/systemd-boot: move builder script in bin folder
(cherry picked from commit ceeddc5b159fe20d4c186bf43e0c8e1c534db9ab)
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix7
1 files changed, 4 insertions, 3 deletions
diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix
index 9d55c21077d13..d7b15ec5bc079 100644
--- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix
+++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix
@@ -54,17 +54,18 @@ let
   checkedSystemdBootBuilder = pkgs.runCommand "systemd-boot" {
     nativeBuildInputs = [ pkgs.mypy ];
   } ''
-    install -m755 ${systemdBootBuilder} $out
+    mkdir -p $out/bin
+    install -m755 ${systemdBootBuilder} $out/bin/systemd-boot-builder
     mypy \
       --no-implicit-optional \
       --disallow-untyped-calls \
       --disallow-untyped-defs \
-      $out
+      $out/bin/systemd-boot-builder
   '';
 
   finalSystemdBootBuilder = pkgs.writeScript "install-systemd-boot.sh" ''
     #!${pkgs.runtimeShell}
-    ${checkedSystemdBootBuilder} "$@"
+    ${checkedSystemdBootBuilder}/bin/systemd-boot-builder "$@"
     ${cfg.extraInstallCommands}
   '';
 in {