diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-03-16 18:01:00 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-16 18:01:00 +0000 |
| commit | 60fbf92c10dd8bd5bf1d5f6f61a10221add2db5c (patch) | |
| tree | 3069dc9f915b1c766b5dc30be6d319186a8e4f8d /pkgs/desktops/mate/mate-panel/default.nix | |
| parent | 9db4d8431217189d40b01a18ba71c67e2975c0ef (diff) | |
| parent | 9d77cc0d53c3f982249e342d100837da73a81520 (diff) | |
| download | nixlib-60fbf92c10dd8bd5bf1d5f6f61a10221add2db5c.tar nixlib-60fbf92c10dd8bd5bf1d5f6f61a10221add2db5c.tar.gz nixlib-60fbf92c10dd8bd5bf1d5f6f61a10221add2db5c.tar.bz2 nixlib-60fbf92c10dd8bd5bf1d5f6f61a10221add2db5c.tar.lz nixlib-60fbf92c10dd8bd5bf1d5f6f61a10221add2db5c.tar.xz nixlib-60fbf92c10dd8bd5bf1d5f6f61a10221add2db5c.tar.zst nixlib-60fbf92c10dd8bd5bf1d5f6f61a10221add2db5c.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/desktops/mate/mate-panel/default.nix')
| -rw-r--r-- | pkgs/desktops/mate/mate-panel/default.nix | 37 |
1 files changed, 27 insertions, 10 deletions
diff --git a/pkgs/desktops/mate/mate-panel/default.nix b/pkgs/desktops/mate/mate-panel/default.nix index 214e1767f25b..75340bf4dc96 100644 --- a/pkgs/desktops/mate/mate-panel/default.nix +++ b/pkgs/desktops/mate/mate-panel/default.nix @@ -5,25 +5,31 @@ , gettext , itstool , glib +, gnome +, gtk-layer-shell +, gtk3 +, libmateweather , libwnck , librsvg , libxml2 , dconf -, gtk3 -, mate +, mate-desktop +, mate-menus , hicolor-icon-theme +, wayland , gobject-introspection , wrapGAppsHook +, marco , mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-panel"; - version = "1.26.4"; + version = "1.28.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "IHD51RVlfl3c2g2H73KXE9upy3sq0GIjvWdKIcxrPa8="; + sha256 = "s70EoJTQ61vX3DOA728MSdmp1SCXM9fM17RtBmogjLo="; }; nativeBuildInputs = [ @@ -35,18 +41,29 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - glib + gtk-layer-shell + libmateweather libwnck librsvg libxml2 - gtk3 dconf - mate.libmateweather - mate.mate-desktop - mate.mate-menus + mate-desktop + mate-menus hicolor-icon-theme + wayland ]; + propagatedBuildInputs = [ + glib + gtk3 + # See https://github.com/mate-desktop/mate-panel/issues/1402 + # This is propagated for mate_panel_applet_settings_new and applet's wrapGAppsHook + gnome.dconf-editor + ]; + + # Needed for Wayland support. + configureFlags = [ "--with-in-process-applets=all" ]; + env.NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; makeFlags = [ @@ -57,7 +74,7 @@ stdenv.mkDerivation rec { preFixup = '' gappsWrapperArgs+=( # Workspace switcher settings, works only when passed after gtk3 schemas in the wrapper for some reason - --prefix XDG_DATA_DIRS : "${glib.getSchemaDataDirPath mate.marco}" + --prefix XDG_DATA_DIRS : "${glib.getSchemaDataDirPath marco}" ) ''; |