Unverified Commit 931e2b8a authored by Bobby Rong's avatar Bobby Rong Committed by GitHub
Browse files

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

budgie.budgie-control-center: 1.3.0 -> 1.4.0
parents 2edca58a b9c8b27f

nixos/modules/services/x11/desktop-managers/budgie.nix

+7 −3
Original line number Diff line number Diff line
@@ -39,6 +39,10 @@ let 
    '';

    destination = "/share/gnome-background-properties/nixos.xml";

  };



  budgie-control-center = pkgs.budgie.budgie-control-center.override {

    enableSshSocket = config.services.openssh.startWhenNeeded;

  };

in {

  options = {

    services.xserver.desktopManager.budgie = {
@@ -114,7 +118,7 @@ in { 
      [

        # Budgie Desktop.

        budgie.budgie-backgrounds

        budgie.budgie-control-center

        budgie-control-center

        (budgie.budgie-desktop-with-plugins.override { plugins = cfg.extraPlugins; })

        budgie.budgie-desktop-view

        budgie.budgie-screensaver
@@ -233,8 +237,8 @@ in { 
    services.gvfs.enable = mkDefault true;



    # Register packages for DBus.

    services.dbus.packages = with pkgs; [

      budgie.budgie-control-center

    services.dbus.packages = [

      budgie-control-center

    ];



    # Register packages for udev.

pkgs/desktops/budgie/budgie-control-center/default.nix

+7 −4
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
, glibc

, gnome

, gnome-desktop

, gnome-online-accounts

, gsettings-desktop-schemas

, gsound

, gtk3
@@ -54,18 +53,19 @@ 
, upower

, webp-pixbuf-loader

, wrapGAppsHook

, enableSshSocket ? false

}:



stdenv.mkDerivation rec {

  pname = "budgie-control-center";

  version = "1.3.0";

  version = "1.4.0";



  src = fetchFromGitHub {

    owner = "BuddiesOfBudgie";

    repo = pname;

    rev = "v${version}";

    fetchSubmodules = true;

    sha256 = "sha256-7E23cgX7TkBJT/yansBfvMx0ddfAwrF7mGfqzbyLY4Q=";

    sha256 = "sha256-W5PF7BPdQdg/7xJ4J+fEnuDdpoG/lyhX56RDnX2DXoY=";

  };



  patches = [
@@ -101,7 +101,6 @@ stdenv.mkDerivation rec { 
    glib

    glib-networking

    gnome-desktop

    gnome-online-accounts

    gnome.adwaita-icon-theme

    gnome.cheese

    gnome.gnome-bluetooth_1_0
@@ -134,6 +133,10 @@ stdenv.mkDerivation rec { 
    upower

  ];



  mesonFlags = [

    (lib.mesonBool "ssh" enableSshSocket)

  ];



  preConfigure = ''

    # For ITS rules

    addToSearchPath "XDG_DATA_DIRS" "${polkit.out}/share"