diff --git a/pkgs/desktops/plasma-5/addons/caffeine-plus.nix b/pkgs/desktops/plasma-5/3rdparty/addons/caffeine-plus.nix similarity index 100% rename from pkgs/desktops/plasma-5/addons/caffeine-plus.nix rename to pkgs/desktops/plasma-5/3rdparty/addons/caffeine-plus.nix diff --git a/pkgs/desktops/plasma-5/kwin/scripts/dynamic-workspaces.nix b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/dynamic-workspaces.nix similarity index 100% rename from pkgs/desktops/plasma-5/kwin/scripts/dynamic-workspaces.nix rename to pkgs/desktops/plasma-5/3rdparty/kwin/scripts/dynamic-workspaces.nix diff --git a/pkgs/desktops/plasma-5/kwin/scripts/krohnkite.nix b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/krohnkite.nix similarity index 100% rename from pkgs/desktops/plasma-5/kwin/scripts/krohnkite.nix rename to pkgs/desktops/plasma-5/3rdparty/kwin/scripts/krohnkite.nix diff --git a/pkgs/desktops/plasma-5/kwin/scripts/tiling.nix b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/tiling.nix similarity index 100% rename from pkgs/desktops/plasma-5/kwin/scripts/tiling.nix rename to pkgs/desktops/plasma-5/3rdparty/kwin/scripts/tiling.nix diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index 07b464258149a0..265c22b556556e 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -138,6 +138,14 @@ let systemsettings = callPackage ./systemsettings.nix {}; user-manager = callPackage ./user-manager.nix {}; xdg-desktop-portal-kde = callPackage ./xdg-desktop-portal-kde.nix {}; + + thirdParty = let inherit (libsForQt5) callPackage; in { + plasma-applet-caffeine-plus = callPackage ./3rdparty/addons/caffeine-plus.nix { }; + kwin-dynamic-workspaces = callPackage ./3rdparty/kwin/scripts/dynamic-workspaces.nix { }; + kwin-tiling = callPackage ./3rdparty/kwin/scripts/tiling.nix { }; + krohnkite = callPackage ./3rdparty/kwin/scripts/krohnkite.nix { }; + }; + }; in lib.makeScope libsForQt5.newScope packages diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d75fb5b570b9be..cc6ec4d348a1f6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25495,13 +25495,11 @@ in plasma-workspace-wallpapers polkit-kde-agent powerdevil sddm-kcm systemsettings user-manager xdg-desktop-portal-kde; - plasma-applet-caffeine-plus = libsForQt5.callPackage ../desktops/plasma-5/addons/caffeine-plus.nix { }; - - kwin-dynamic-workspaces = libsForQt5.callPackage ../desktops/plasma-5/kwin/scripts/dynamic-workspaces.nix { }; - - kwin-tiling = libsForQt5.callPackage ../desktops/plasma-5/kwin/scripts/tiling.nix { }; - - krohnkite = libsForQt5.callPackage ../desktops/plasma-5/kwin/scripts/krohnkite.nix { }; + inherit (plasma5.thirdParty) + plasma-applet-caffeine-plus + kwin-dynamic-workspaces + kwin-tiling + krohnkite; ### SCIENCE