diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-01-27 06:01:37 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-27 06:01:37 +0000 |
| commit | d976132a1fda4f3d3c8a2375d8db51bb80f0d696 (patch) | |
| tree | 193cb08f81e7a57f83fbb7c272d4fe7fcf724f8b /nixos | |
| parent | 43545381393695f722344b085620937fa3367a8a (diff) | |
| parent | 3fdd362299d2b65c964d92c1e2c52fa441397ee0 (diff) | |
| download | nixlib-d976132a1fda4f3d3c8a2375d8db51bb80f0d696.tar nixlib-d976132a1fda4f3d3c8a2375d8db51bb80f0d696.tar.gz nixlib-d976132a1fda4f3d3c8a2375d8db51bb80f0d696.tar.bz2 nixlib-d976132a1fda4f3d3c8a2375d8db51bb80f0d696.tar.lz nixlib-d976132a1fda4f3d3c8a2375d8db51bb80f0d696.tar.xz nixlib-d976132a1fda4f3d3c8a2375d8db51bb80f0d696.tar.zst nixlib-d976132a1fda4f3d3c8a2375d8db51bb80f0d696.zip | |
Merge staging-next into staging
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/plasma5.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index fc9de2500ba4..38c858aaef05 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -480,7 +480,7 @@ in pkgs.maliit-framework pkgs.maliit-keyboard ] - ++ lib.optionals (cfg.mobile.installRecommendedSoftware) (with libsForQt5.plasmaMobileGear;[ + ++ lib.optionals (cfg.mobile.installRecommendedSoftware) (with pkgs.plasma5Packages.plasmaMobileGear; [ # Additional software made for Plasma Mobile. alligator angelfish 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 { |