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

budgie.budgie-control-center: 1.3.0 -> 1.4.0

authored by Bobby Rong and committed by GitHub 931e2b8a 2edca58a

+14 -7
+7 -3
nixos/modules/services/x11/desktop-managers/budgie.nix
··· 39 ''; 40 destination = "/share/gnome-background-properties/nixos.xml"; 41 }; 42 in { 43 options = { 44 services.xserver.desktopManager.budgie = { ··· 114 [ 115 # Budgie Desktop. 116 budgie.budgie-backgrounds 117 - budgie.budgie-control-center 118 (budgie.budgie-desktop-with-plugins.override { plugins = cfg.extraPlugins; }) 119 budgie.budgie-desktop-view 120 budgie.budgie-screensaver ··· 233 services.gvfs.enable = mkDefault true; 234 235 # Register packages for DBus. 236 - services.dbus.packages = with pkgs; [ 237 - budgie.budgie-control-center 238 ]; 239 240 # Register packages for udev.
··· 39 ''; 40 destination = "/share/gnome-background-properties/nixos.xml"; 41 }; 42 + 43 + budgie-control-center = pkgs.budgie.budgie-control-center.override { 44 + enableSshSocket = config.services.openssh.startWhenNeeded; 45 + }; 46 in { 47 options = { 48 services.xserver.desktopManager.budgie = { ··· 118 [ 119 # Budgie Desktop. 120 budgie.budgie-backgrounds 121 + budgie-control-center 122 (budgie.budgie-desktop-with-plugins.override { plugins = cfg.extraPlugins; }) 123 budgie.budgie-desktop-view 124 budgie.budgie-screensaver ··· 237 services.gvfs.enable = mkDefault true; 238 239 # Register packages for DBus. 240 + services.dbus.packages = [ 241 + budgie-control-center 242 ]; 243 244 # Register packages for udev.
+7 -4
pkgs/desktops/budgie/budgie-control-center/default.nix
··· 19 , glibc 20 , gnome 21 , gnome-desktop 22 - , gnome-online-accounts 23 , gsettings-desktop-schemas 24 , gsound 25 , gtk3 ··· 54 , upower 55 , webp-pixbuf-loader 56 , wrapGAppsHook 57 }: 58 59 stdenv.mkDerivation rec { 60 pname = "budgie-control-center"; 61 - version = "1.3.0"; 62 63 src = fetchFromGitHub { 64 owner = "BuddiesOfBudgie"; 65 repo = pname; 66 rev = "v${version}"; 67 fetchSubmodules = true; 68 - sha256 = "sha256-7E23cgX7TkBJT/yansBfvMx0ddfAwrF7mGfqzbyLY4Q="; 69 }; 70 71 patches = [ ··· 101 glib 102 glib-networking 103 gnome-desktop 104 - gnome-online-accounts 105 gnome.adwaita-icon-theme 106 gnome.cheese 107 gnome.gnome-bluetooth_1_0 ··· 132 samba 133 udisks2 134 upower 135 ]; 136 137 preConfigure = ''
··· 19 , glibc 20 , gnome 21 , gnome-desktop 22 , gsettings-desktop-schemas 23 , gsound 24 , gtk3 ··· 53 , upower 54 , webp-pixbuf-loader 55 , wrapGAppsHook 56 + , enableSshSocket ? false 57 }: 58 59 stdenv.mkDerivation rec { 60 pname = "budgie-control-center"; 61 + version = "1.4.0"; 62 63 src = fetchFromGitHub { 64 owner = "BuddiesOfBudgie"; 65 repo = pname; 66 rev = "v${version}"; 67 fetchSubmodules = true; 68 + sha256 = "sha256-W5PF7BPdQdg/7xJ4J+fEnuDdpoG/lyhX56RDnX2DXoY="; 69 }; 70 71 patches = [ ··· 101 glib 102 glib-networking 103 gnome-desktop 104 gnome.adwaita-icon-theme 105 gnome.cheese 106 gnome.gnome-bluetooth_1_0 ··· 131 samba 132 udisks2 133 upower 134 + ]; 135 + 136 + mesonFlags = [ 137 + (lib.mesonBool "ssh" enableSshSocket) 138 ]; 139 140 preConfigure = ''