diff options
| -rw-r--r-- | nixos/tests/budgie.nix | 2 | ||||
| -rw-r--r-- | pkgs/desktops/budgie/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/desktops/budgie/plugins/budgie-analogue-clock-applet/default.nix (renamed from pkgs/desktops/budgie/budgie-analogue-clock-applet/default.nix) | 4 | ||||
| -rw-r--r-- | pkgs/desktops/budgie/plugins/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
5 files changed, 7 insertions, 4 deletions
diff --git a/nixos/tests/budgie.nix b/nixos/tests/budgie.nix index a2599572b3bf..8fe32bb26fbd 100644 --- a/nixos/tests/budgie.nix +++ b/nixos/tests/budgie.nix @@ -23,7 +23,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { services.xserver.desktopManager.budgie = { enable = true; extraPlugins = [ - pkgs.budgie.budgie-analogue-clock-applet + pkgs.budgiePlugins.budgie-analogue-clock-applet ]; }; }; diff --git a/pkgs/desktops/budgie/default.nix b/pkgs/desktops/budgie/default.nix index 8c49ac5b0234..afe954610fff 100644 --- a/pkgs/desktops/budgie/default.nix +++ b/pkgs/desktops/budgie/default.nix @@ -1,7 +1,6 @@ { lib, pkgs }: lib.makeScope pkgs.newScope (self: with self; { - budgie-analogue-clock-applet = callPackage ./budgie-analogue-clock-applet { }; budgie-backgrounds = callPackage ./budgie-backgrounds { }; budgie-control-center = callPackage ./budgie-control-center { }; budgie-desktop = callPackage ./budgie-desktop { }; diff --git a/pkgs/desktops/budgie/budgie-analogue-clock-applet/default.nix b/pkgs/desktops/budgie/plugins/budgie-analogue-clock-applet/default.nix index 798992886b9b..c443cb72dd49 100644 --- a/pkgs/desktops/budgie/budgie-analogue-clock-applet/default.nix +++ b/pkgs/desktops/budgie/plugins/budgie-analogue-clock-applet/default.nix @@ -5,7 +5,7 @@ , ninja , pkg-config , vala -, budgie-desktop +, budgie , gtk3 , libpeas }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - budgie-desktop + budgie.budgie-desktop gtk3 libpeas ]; diff --git a/pkgs/desktops/budgie/plugins/default.nix b/pkgs/desktops/budgie/plugins/default.nix new file mode 100644 index 000000000000..290618e9924d --- /dev/null +++ b/pkgs/desktops/budgie/plugins/default.nix @@ -0,0 +1,3 @@ +{ callPackage }: { + budgie-analogue-clock-applet = callPackage ./budgie-analogue-clock-applet { }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dbca18144b4e..77a7b19b9402 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37021,6 +37021,7 @@ with pkgs; arcanPackages = recurseIntoAttrs (callPackage ../desktops/arcan { }); budgie = recurseIntoAttrs (callPackage ../desktops/budgie { }); + budgiePlugins = recurseIntoAttrs (callPackage ../desktops/budgie/plugins { }); cdesktopenv = callPackage ../desktops/cdesktopenv { }; |