Loading nixos/modules/services/desktop-managers/budgie.nix +3 −1 Original line number Diff line number Diff line Loading @@ -185,6 +185,7 @@ in ] ++ lib.optional config.networking.networkmanager.enable pkgs.networkmanagerapplet ++ (utils.removePackagesByName [ bluejay nemo eom pluma Loading @@ -199,6 +200,7 @@ in gammastep grim killall mesa-demos # eglinfo slurp swaybg swayidle Loading Loading @@ -247,7 +249,7 @@ in programs.nm-applet.enable = config.networking.networkmanager.enable; # Budgie has no Network applet. programs.nm-applet.indicator = true; # Budgie uses AppIndicators. hardware.bluetooth.enable = mkDefault true; # for Budgie's Status Indicator and BCC's Bluetooth panel. hardware.bluetooth.enable = mkDefault true; # for Budgie's Status Indicator and Bluejay. xdg.portal.enable = mkDefault true; # for BCC's Applications panel. xdg.portal.extraPortals = with pkgs; [ Loading pkgs/by-name/bu/budgie-control-center/package.nix +2 −8 Original line number Diff line number Diff line Loading @@ -5,7 +5,6 @@ replaceVars, accountsservice, budgie-desktop, cheese, colord, colord-gtk, cups, Loading @@ -19,8 +18,6 @@ glibc, gnome, gst_all_1, gnome-bluetooth_1_0, gnome-color-manager, gnome-desktop, gnome-settings-daemon, gsettings-desktop-schemas, Loading Loading @@ -72,20 +69,19 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "budgie-control-center"; version = "2.1.0"; version = "2.1.1"; src = fetchFromGitHub { owner = "BuddiesOfBudgie"; repo = "budgie-control-center"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; hash = "sha256-sdAzReZVAZ5omLOhly/l3buiw01eem+k9+3RbVPzS2g="; hash = "sha256-UiKMYLQ44U4w9MdSTp/AJg3scOoSCeG6gXUBCrM9pc8="; }; patches = [ (replaceVars ./paths.patch { budgie_desktop = budgie-desktop; gcm = gnome-color-manager; inherit cups libgnomekbd Loading Loading @@ -117,8 +113,6 @@ stdenv.mkDerivation (finalAttrs: { glib-networking gnome-desktop gst_all_1.gstreamer cheese gnome-bluetooth_1_0 gnome-settings-daemon gsettings-desktop-schemas gsound Loading pkgs/by-name/bu/budgie-control-center/paths.patch +0 −39 Original line number Diff line number Diff line diff --git a/panels/color/cc-color-panel.c b/panels/color/cc-color-panel.c index a2f90b093..7801b4a5e 100644 --- a/panels/color/cc-color-panel.c +++ b/panels/color/cc-color-panel.c @@ -587,7 +587,7 @@ gcm_prefs_calibrate_cb (CcColorPanel *prefs) /* run with modal set */ argv = g_ptr_array_new_with_free_func (g_free); - g_ptr_array_add (argv, g_strdup ("gcm-calibrate")); + g_ptr_array_add (argv, g_build_filename ("@gcm@", "bin", "gcm-calibrate", NULL)); g_ptr_array_add (argv, g_strdup ("--device")); g_ptr_array_add (argv, g_strdup (cd_device_get_id (prefs->current_device))); g_ptr_array_add (argv, g_strdup ("--parent-window")); @@ -940,7 +940,7 @@ gcm_prefs_profile_view (CcColorPanel *prefs, CdProfile *profile) /* open up gcm-viewer as a info pane */ argv = g_ptr_array_new_with_free_func (g_free); - g_ptr_array_add (argv, g_strdup ("gcm-viewer")); + g_ptr_array_add (argv, g_build_filename ("@gcm@", "bin", "gcm-viewer", NULL)); g_ptr_array_add (argv, g_strdup ("--profile")); g_ptr_array_add (argv, g_strdup (cd_profile_get_id (profile))); g_ptr_array_add (argv, g_strdup ("--parent-window")); @@ -1186,15 +1186,12 @@ gcm_prefs_device_clicked (CcColorPanel *prefs, CdDevice *device) static void gcm_prefs_profile_clicked (CcColorPanel *prefs, CdProfile *profile, CdDevice *device) { - g_autofree gchar *s = NULL; - /* get profile */ g_debug ("selected profile = %s", cd_profile_get_filename (profile)); /* allow getting profile info */ - if (cd_profile_get_filename (profile) != NULL && - (s = g_find_program_in_path ("gcm-viewer")) != NULL) + if (cd_profile_get_filename (profile) != NULL) gtk_widget_set_sensitive (prefs->toolbutton_profile_view, TRUE); else gtk_widget_set_sensitive (prefs->toolbutton_profile_view, FALSE); diff --git a/panels/datetime/tz.h b/panels/datetime/tz.h index b6b7ab9d0..31f268e91 100644 --- a/panels/datetime/tz.h Loading pkgs/by-name/bu/budgie-desktop-view/package.nix +2 −2 Original line number Diff line number Diff line Loading @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "budgie-desktop-view"; version = "10.10.1"; version = "10.10.2"; src = fetchFromGitHub { owner = "BuddiesOfBudgie"; repo = "budgie-desktop-view"; rev = "v${finalAttrs.version}"; hash = "sha256-ro+/Aqsyr9py3SEdsRg+eiQLDkFI0wI4MMdCyH02E3U="; hash = "sha256-XwfNbrK9+FCYtO2tiz5TfHsJmctFbcEaUORiVs/aynE="; }; nativeBuildInputs = [ Loading pkgs/by-name/bu/budgie-desktop/package.nix +5 −10 Original line number Diff line number Diff line Loading @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, fetchpatch, accountsservice, alsa-lib, budgie-desktop-services, Loading Loading @@ -39,11 +38,13 @@ vala, validatePkgConfig, wrapGAppsHook3, xdg-desktop-portal, }: let pythonEnv = python3.withPackages ( pp: with pp; [ dbus-python psutil pygobject3 systemd-python Loading @@ -52,14 +53,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "budgie-desktop"; version = "10.10.1"; version = "10.10.2"; src = fetchFromGitHub { owner = "BuddiesOfBudgie"; repo = "budgie-desktop"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; hash = "sha256-6SRnub0FMRE9AcHwsnYH4WMdG2kqEpl5dfHy56FwrGU="; hash = "sha256-Eaq7/LY65HpyPRfR57FWDPqkVqBbymlHHQHFUvxER20="; }; outputs = [ Loading @@ -70,13 +71,6 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./plugins.patch # Don't use scaling factors # https://github.com/BuddiesOfBudgie/budgie-desktop/pull/864 (fetchpatch { url = "https://github.com/BuddiesOfBudgie/budgie-desktop/commit/03d18336c3d50d14e3e81ef03ef8ebd548d8e00c.patch"; hash = "sha256-pO1t3nnyYX2XDqH6wr+00MHsM0fAT0MOSuk+lN+2CNY="; }) ]; nativeBuildInputs = [ Loading Loading @@ -130,6 +124,7 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' substituteInPlace src/session/budgie-desktop.in \ --replace-fail "@bindir@/org.buddiesofbudgie.Services" "${lib.getExe budgie-desktop-services}" \ --replace-fail "@libexecdirroot@/xdg-desktop-portal" "${xdg-desktop-portal}/libexec/xdg-desktop-portal" \ --replace-fail "@gsd_libexecdir@/budgie-session-compositor-ready" "${budgie-session}/libexec/budgie-session-compositor-ready" chmod +x src/bridges/labwc/labwc_bridge.py Loading Loading
nixos/modules/services/desktop-managers/budgie.nix +3 −1 Original line number Diff line number Diff line Loading @@ -185,6 +185,7 @@ in ] ++ lib.optional config.networking.networkmanager.enable pkgs.networkmanagerapplet ++ (utils.removePackagesByName [ bluejay nemo eom pluma Loading @@ -199,6 +200,7 @@ in gammastep grim killall mesa-demos # eglinfo slurp swaybg swayidle Loading Loading @@ -247,7 +249,7 @@ in programs.nm-applet.enable = config.networking.networkmanager.enable; # Budgie has no Network applet. programs.nm-applet.indicator = true; # Budgie uses AppIndicators. hardware.bluetooth.enable = mkDefault true; # for Budgie's Status Indicator and BCC's Bluetooth panel. hardware.bluetooth.enable = mkDefault true; # for Budgie's Status Indicator and Bluejay. xdg.portal.enable = mkDefault true; # for BCC's Applications panel. xdg.portal.extraPortals = with pkgs; [ Loading
pkgs/by-name/bu/budgie-control-center/package.nix +2 −8 Original line number Diff line number Diff line Loading @@ -5,7 +5,6 @@ replaceVars, accountsservice, budgie-desktop, cheese, colord, colord-gtk, cups, Loading @@ -19,8 +18,6 @@ glibc, gnome, gst_all_1, gnome-bluetooth_1_0, gnome-color-manager, gnome-desktop, gnome-settings-daemon, gsettings-desktop-schemas, Loading Loading @@ -72,20 +69,19 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "budgie-control-center"; version = "2.1.0"; version = "2.1.1"; src = fetchFromGitHub { owner = "BuddiesOfBudgie"; repo = "budgie-control-center"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; hash = "sha256-sdAzReZVAZ5omLOhly/l3buiw01eem+k9+3RbVPzS2g="; hash = "sha256-UiKMYLQ44U4w9MdSTp/AJg3scOoSCeG6gXUBCrM9pc8="; }; patches = [ (replaceVars ./paths.patch { budgie_desktop = budgie-desktop; gcm = gnome-color-manager; inherit cups libgnomekbd Loading Loading @@ -117,8 +113,6 @@ stdenv.mkDerivation (finalAttrs: { glib-networking gnome-desktop gst_all_1.gstreamer cheese gnome-bluetooth_1_0 gnome-settings-daemon gsettings-desktop-schemas gsound Loading
pkgs/by-name/bu/budgie-control-center/paths.patch +0 −39 Original line number Diff line number Diff line diff --git a/panels/color/cc-color-panel.c b/panels/color/cc-color-panel.c index a2f90b093..7801b4a5e 100644 --- a/panels/color/cc-color-panel.c +++ b/panels/color/cc-color-panel.c @@ -587,7 +587,7 @@ gcm_prefs_calibrate_cb (CcColorPanel *prefs) /* run with modal set */ argv = g_ptr_array_new_with_free_func (g_free); - g_ptr_array_add (argv, g_strdup ("gcm-calibrate")); + g_ptr_array_add (argv, g_build_filename ("@gcm@", "bin", "gcm-calibrate", NULL)); g_ptr_array_add (argv, g_strdup ("--device")); g_ptr_array_add (argv, g_strdup (cd_device_get_id (prefs->current_device))); g_ptr_array_add (argv, g_strdup ("--parent-window")); @@ -940,7 +940,7 @@ gcm_prefs_profile_view (CcColorPanel *prefs, CdProfile *profile) /* open up gcm-viewer as a info pane */ argv = g_ptr_array_new_with_free_func (g_free); - g_ptr_array_add (argv, g_strdup ("gcm-viewer")); + g_ptr_array_add (argv, g_build_filename ("@gcm@", "bin", "gcm-viewer", NULL)); g_ptr_array_add (argv, g_strdup ("--profile")); g_ptr_array_add (argv, g_strdup (cd_profile_get_id (profile))); g_ptr_array_add (argv, g_strdup ("--parent-window")); @@ -1186,15 +1186,12 @@ gcm_prefs_device_clicked (CcColorPanel *prefs, CdDevice *device) static void gcm_prefs_profile_clicked (CcColorPanel *prefs, CdProfile *profile, CdDevice *device) { - g_autofree gchar *s = NULL; - /* get profile */ g_debug ("selected profile = %s", cd_profile_get_filename (profile)); /* allow getting profile info */ - if (cd_profile_get_filename (profile) != NULL && - (s = g_find_program_in_path ("gcm-viewer")) != NULL) + if (cd_profile_get_filename (profile) != NULL) gtk_widget_set_sensitive (prefs->toolbutton_profile_view, TRUE); else gtk_widget_set_sensitive (prefs->toolbutton_profile_view, FALSE); diff --git a/panels/datetime/tz.h b/panels/datetime/tz.h index b6b7ab9d0..31f268e91 100644 --- a/panels/datetime/tz.h Loading
pkgs/by-name/bu/budgie-desktop-view/package.nix +2 −2 Original line number Diff line number Diff line Loading @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "budgie-desktop-view"; version = "10.10.1"; version = "10.10.2"; src = fetchFromGitHub { owner = "BuddiesOfBudgie"; repo = "budgie-desktop-view"; rev = "v${finalAttrs.version}"; hash = "sha256-ro+/Aqsyr9py3SEdsRg+eiQLDkFI0wI4MMdCyH02E3U="; hash = "sha256-XwfNbrK9+FCYtO2tiz5TfHsJmctFbcEaUORiVs/aynE="; }; nativeBuildInputs = [ Loading
pkgs/by-name/bu/budgie-desktop/package.nix +5 −10 Original line number Diff line number Diff line Loading @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, fetchpatch, accountsservice, alsa-lib, budgie-desktop-services, Loading Loading @@ -39,11 +38,13 @@ vala, validatePkgConfig, wrapGAppsHook3, xdg-desktop-portal, }: let pythonEnv = python3.withPackages ( pp: with pp; [ dbus-python psutil pygobject3 systemd-python Loading @@ -52,14 +53,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "budgie-desktop"; version = "10.10.1"; version = "10.10.2"; src = fetchFromGitHub { owner = "BuddiesOfBudgie"; repo = "budgie-desktop"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; hash = "sha256-6SRnub0FMRE9AcHwsnYH4WMdG2kqEpl5dfHy56FwrGU="; hash = "sha256-Eaq7/LY65HpyPRfR57FWDPqkVqBbymlHHQHFUvxER20="; }; outputs = [ Loading @@ -70,13 +71,6 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./plugins.patch # Don't use scaling factors # https://github.com/BuddiesOfBudgie/budgie-desktop/pull/864 (fetchpatch { url = "https://github.com/BuddiesOfBudgie/budgie-desktop/commit/03d18336c3d50d14e3e81ef03ef8ebd548d8e00c.patch"; hash = "sha256-pO1t3nnyYX2XDqH6wr+00MHsM0fAT0MOSuk+lN+2CNY="; }) ]; nativeBuildInputs = [ Loading Loading @@ -130,6 +124,7 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' substituteInPlace src/session/budgie-desktop.in \ --replace-fail "@bindir@/org.buddiesofbudgie.Services" "${lib.getExe budgie-desktop-services}" \ --replace-fail "@libexecdirroot@/xdg-desktop-portal" "${xdg-desktop-portal}/libexec/xdg-desktop-portal" \ --replace-fail "@gsd_libexecdir@/budgie-session-compositor-ready" "${budgie-session}/libexec/budgie-session-compositor-ready" chmod +x src/bridges/labwc/labwc_bridge.py Loading