about summary refs log tree commit diff
path: root/nixos/modules/system
diff options
context:
space:
mode:
authorJulien Malka <julien@malka.sh>2024-01-27 01:27:51 +0000
committerJulien Malka <julien@malka.sh>2024-01-27 01:29:40 +0000
commitceeddc5b159fe20d4c186bf43e0c8e1c534db9ab (patch)
tree28795d1dc7fc15f5cee81f9d2a57421f94847b9e /nixos/modules/system
parentbf15de8c3bc13bb07d3a5f0cca117084e4ce90cd (diff)
downloadnixlib-ceeddc5b159fe20d4c186bf43e0c8e1c534db9ab.tar
nixlib-ceeddc5b159fe20d4c186bf43e0c8e1c534db9ab.tar.gz
nixlib-ceeddc5b159fe20d4c186bf43e0c8e1c534db9ab.tar.bz2
nixlib-ceeddc5b159fe20d4c186bf43e0c8e1c534db9ab.tar.lz
nixlib-ceeddc5b159fe20d4c186bf43e0c8e1c534db9ab.tar.xz
nixlib-ceeddc5b159fe20d4c186bf43e0c8e1c534db9ab.tar.zst
nixlib-ceeddc5b159fe20d4c186bf43e0c8e1c534db9ab.zip
nixos/systemd-boot: move builder script in bin folder
Diffstat (limited to 'nixos/modules/system')
-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 3b140726c2d6..a126a6725e1b 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 {