Unverified Commit b0051767 authored by Pierre Bourdon's avatar Pierre Bourdon Committed by GitHub
Browse files

Merge pull request #284153 from JulienMalka/systemd-boot-builder-folder 

nixos/systemd-boot: move builder script in bin folder
parents 99b67695 ceeddc5b

nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix

+4 −3
Original line number Diff line number Diff line
@@ -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 {