diff options
Diffstat (limited to 'nixpkgs/pkgs/desktops/pantheon/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/desktops/pantheon/default.nix | 41 |
1 files changed, 25 insertions, 16 deletions
diff --git a/nixpkgs/pkgs/desktops/pantheon/default.nix b/nixpkgs/pkgs/desktops/pantheon/default.nix index dc1245e1b156..b3b5409f6a01 100644 --- a/nixpkgs/pkgs/desktops/pantheon/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/default.nix @@ -12,25 +12,31 @@ lib.makeScope pkgs.newScope (self: with self; { switchboard-plug-onlineaccounts switchboard-plug-pantheon-shell switchboard-plug-power switchboard-plug-printers switchboard-plug-security-privacy switchboard-plug-sharing - switchboard-plug-sound + switchboard-plug-sound switchboard-plug-wacom ]; wingpanelIndicators = [ - wingpanel-applications-menu wingpanel-indicator-bluetooth - wingpanel-indicator-datetime wingpanel-indicator-keyboard - wingpanel-indicator-network wingpanel-indicator-nightlight - wingpanel-indicator-notifications wingpanel-indicator-power - wingpanel-indicator-session wingpanel-indicator-sound + wingpanel-applications-menu wingpanel-indicator-a11y + wingpanel-indicator-bluetooth wingpanel-indicator-datetime + wingpanel-indicator-keyboard wingpanel-indicator-network + wingpanel-indicator-nightlight wingpanel-indicator-notifications + wingpanel-indicator-power wingpanel-indicator-session + wingpanel-indicator-sound ]; maintainers = lib.teams.pantheon.members; - mutter = pkgs.gnome.mutter334; + mutter = pkgs.gnome.mutter338; + + # Using 3.38 to match Mutter used in Pantheon + gnome-settings-daemon = pkgs.gnome.gnome-settings-daemon338; elementary-gsettings-schemas = callPackage ./desktop/elementary-gsettings-schemas { }; notes-up = pkgs.notes-up.override { withPantheon = true; }; + touchegg = pkgs.touchegg.override { withPantheon = true; }; + #### APPS appcenter = callPackage ./apps/appcenter { }; @@ -55,12 +61,16 @@ lib.makeScope pkgs.newScope (self: with self; { elementary-photos = callPackage ./apps/elementary-photos { }; - elementary-screenshot-tool = callPackage ./apps/elementary-screenshot-tool { }; + elementary-screenshot = callPackage ./apps/elementary-screenshot { }; + + elementary-tasks = callPackage ./apps/elementary-tasks { }; elementary-terminal = callPackage ./apps/elementary-terminal { }; elementary-videos = callPackage ./apps/elementary-videos { }; + epiphany = pkgs.epiphany.override { withPantheon = true; }; + sideload = callPackage ./apps/sideload { }; #### DESKTOP @@ -103,16 +113,9 @@ lib.makeScope pkgs.newScope (self: with self; { elementary-capnet-assist = callPackage ./services/elementary-capnet-assist { }; - elementary-dpms-helper = callPackage ./services/elementary-dpms-helper { }; - elementary-notifications = callPackage ./services/elementary-notifications { }; - # We're using ubuntu and elementary's patchset due to reasons - # explained here -> https://github.com/elementary/greeter/issues/92#issuecomment-376215614 - # Take note of "I am holding off on "fixing" this bug for as long as possible." - elementary-settings-daemon = callPackage ./services/elementary-settings-daemon { - inherit (gnome) gnome-desktop; - }; + elementary-settings-daemon = callPackage ./services/elementary-settings-daemon { }; pantheon-agent-geoclue2 = callPackage ./services/pantheon-agent-geoclue2 { }; @@ -122,6 +125,8 @@ lib.makeScope pkgs.newScope (self: with self; { wingpanel-applications-menu = callPackage ./desktop/wingpanel-indicators/applications-menu { }; + wingpanel-indicator-a11y = callPackage ./desktop/wingpanel-indicators/a11y { }; + wingpanel-indicator-bluetooth = callPackage ./desktop/wingpanel-indicators/bluetooth { }; wingpanel-indicator-datetime = callPackage ./desktop/wingpanel-indicators/datetime { }; @@ -184,6 +189,8 @@ lib.makeScope pkgs.newScope (self: with self; { switchboard-plug-sound = callPackage ./apps/switchboard-plugs/sound { }; + switchboard-plug-wacom = callPackage ./apps/switchboard-plugs/wacom { }; + ### ARTWORK elementary-gtk-theme = callPackage ./artwork/elementary-gtk-theme { }; @@ -204,4 +211,6 @@ lib.makeScope pkgs.newScope (self: with self; { cerbere = throw "Cerbere is now obsolete https://github.com/elementary/cerbere/releases/tag/2.5.1."; + elementary-screenshot-tool = elementary-screenshot; # added 2021-07-21 + }) |