diff --git a/pkgs/by-name/bu/budgie-control-center/introduction.list b/pkgs/by-name/bu/budgie-control-center/introduction.list new file mode 100644 index 000000000000..520e673a2c03 --- /dev/null +++ b/pkgs/by-name/bu/budgie-control-center/introduction.list @@ -0,0 +1,5 @@ +# Introduction panel default applications +# This file contains full paths to .desktop files to display +# Lines starting with # are comments +@wdisplays@/share/applications/network.cycles.wdisplays.desktop +@budgie_desktop@/share/applications/org.buddiesofbudgie.BudgieDesktopSettings.desktop diff --git a/pkgs/by-name/bu/budgie-control-center/package.nix b/pkgs/by-name/bu/budgie-control-center/package.nix index 1dc34f6398af..341af1c971dc 100644 --- a/pkgs/by-name/bu/budgie-control-center/package.nix +++ b/pkgs/by-name/bu/budgie-control-center/package.nix @@ -4,11 +4,8 @@ fetchFromGitHub, replaceVars, accountsservice, - adwaita-icon-theme, budgie-desktop, cheese, - clutter, - clutter-gtk, colord, colord-gtk, cups, @@ -25,14 +22,11 @@ gnome-bluetooth_1_0, gnome-color-manager, gnome-desktop, - gnome-remote-desktop, gnome-settings-daemon, - gnome-user-share, gsettings-desktop-schemas, gsound, gtk3, ibus, - libcanberra-gtk3, libepoxy, libgnomekbd, libgtop, @@ -49,7 +43,6 @@ libxslt, meson, modemmanager, - mutter, networkmanager, networkmanagerapplet, ninja, @@ -63,21 +56,30 @@ tzdata, udisks, upower, + wdisplays, webp-pixbuf-loader, wrapGAppsHook3, enableSshSocket ? false, }: +let + introduction_list = ( + replaceVars ./introduction.list { + budgie_desktop = budgie-desktop; + inherit wdisplays; + } + ); +in stdenv.mkDerivation (finalAttrs: { pname = "budgie-control-center"; - version = "1.4.1"; + version = "2.1.0"; src = fetchFromGitHub { owner = "BuddiesOfBudgie"; repo = "budgie-control-center"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-Je3X1V4U2t0LMxWwtoYZKEI56IS4zK/w6OL615tqKkk="; + hash = "sha256-sdAzReZVAZ5omLOhly/l3buiw01eem+k9+3RbVPzS2g="; }; patches = [ @@ -106,8 +108,6 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ accountsservice - clutter - clutter-gtk colord colord-gtk fontconfig @@ -117,18 +117,13 @@ stdenv.mkDerivation (finalAttrs: { glib-networking gnome-desktop gst_all_1.gstreamer - adwaita-icon-theme cheese gnome-bluetooth_1_0 - gnome-remote-desktop gnome-settings-daemon - gnome-user-share - mutter gsettings-desktop-schemas gsound gtk3 ibus - libcanberra-gtk3 libepoxy libgtop libgudev @@ -137,7 +132,6 @@ stdenv.mkDerivation (finalAttrs: { libnma libpulseaudio libpwquality - librsvg libsecret libwacom libxml2 @@ -167,6 +161,8 @@ stdenv.mkDerivation (finalAttrs: { ]; } }" + + install -Dm644 ${introduction_list} $out/share/budgie-control-center/introduction/introduction.list ''; preFixup = '' @@ -176,18 +172,11 @@ stdenv.mkDerivation (finalAttrs: { # Thumbnailers (for setting user profile pictures) --prefix XDG_DATA_DIRS : "${gdk-pixbuf}/share" --prefix XDG_DATA_DIRS : "${librsvg}/share" - # WM keyboard shortcuts - --prefix XDG_DATA_DIRS : "${mutter}/share" ) ''; separateDebugInfo = true; - # Fix GCC 14 build. - # cc-display-panel.c:962:41: error: passing argument 1 of 'gtk_widget_set_sensitive' - # from incompatible pointer type [-Wincompatible-pointer-types] - env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; - passthru = { tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; updateScript = nix-update-script { };