BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #289788 from FedericoSchonborn/budgie-control-center-1.4.0

Browse source 
budgie.budgie-control-center: 1.3.0 -> 1.4.0
This commit is contained in:
Bobby Rong 2024-02-20 12:43:23 +08:00 committed by GitHub
commit 931e2b8adc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
nixos/modules/services/x11/desktop-managers/budgie.nix
View file

@ -39,6 +39,10 @@ let
''; '';
destination = "/share/gnome-background-properties/nixos.xml"; destination = "/share/gnome-background-properties/nixos.xml";
}; };
budgie-control-center = pkgs.budgie.budgie-control-center.override {
enableSshSocket = config.services.openssh.startWhenNeeded;
};
in { in {
options = { options = {
services.xserver.desktopManager.budgie = { services.xserver.desktopManager.budgie = {
@ -114,7 +118,7 @@ in {
[ [
# Budgie Desktop. # Budgie Desktop.
budgie.budgie-backgrounds budgie.budgie-backgrounds
budgie.budgie-control-center budgie-control-center
(budgie.budgie-desktop-with-plugins.override { plugins = cfg.extraPlugins; }) (budgie.budgie-desktop-with-plugins.override { plugins = cfg.extraPlugins; })
budgie.budgie-desktop-view budgie.budgie-desktop-view
budgie.budgie-screensaver budgie.budgie-screensaver
@ -233,8 +237,8 @@ in {
services.gvfs.enable = mkDefault true; services.gvfs.enable = mkDefault true;
# Register packages for DBus. # Register packages for DBus.
services.dbus.packages = with pkgs; [ services.dbus.packages = [
budgie.budgie-control-center budgie-control-center
]; ];
# Register packages for udev. # Register packages for udev.

11
pkgs/desktops/budgie/budgie-control-center/default.nix
View file

@ -19,7 +19,6 @@
, glibc , glibc
, gnome , gnome
, gnome-desktop , gnome-desktop
, gnome-online-accounts
, gsettings-desktop-schemas , gsettings-desktop-schemas
, gsound , gsound
, gtk3 , gtk3
@ -54,18 +53,19 @@
, upower , upower
, webp-pixbuf-loader , webp-pixbuf-loader
, wrapGAppsHook , wrapGAppsHook
, enableSshSocket ? false
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "budgie-control-center"; pname = "budgie-control-center";
version = "1.3.0"; version = "1.4.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "BuddiesOfBudgie"; owner = "BuddiesOfBudgie";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
fetchSubmodules = true; fetchSubmodules = true;
sha256 = "sha256-7E23cgX7TkBJT/yansBfvMx0ddfAwrF7mGfqzbyLY4Q="; sha256 = "sha256-W5PF7BPdQdg/7xJ4J+fEnuDdpoG/lyhX56RDnX2DXoY=";
}; };
patches = [ patches = [
@ -101,7 +101,6 @@ stdenv.mkDerivation rec {
glib glib
glib-networking glib-networking
gnome-desktop gnome-desktop
gnome-online-accounts
gnome.adwaita-icon-theme gnome.adwaita-icon-theme
gnome.cheese gnome.cheese
gnome.gnome-bluetooth_1_0 gnome.gnome-bluetooth_1_0
@ -134,6 +133,10 @@ stdenv.mkDerivation rec {
upower upower
]; ];
mesonFlags = [
(lib.mesonBool "ssh" enableSshSocket)
];
preConfigure = '' preConfigure = ''
# For ITS rules # For ITS rules
addToSearchPath "XDG_DATA_DIRS" "${polkit.out}/share" addToSearchPath "XDG_DATA_DIRS" "${polkit.out}/share"