diff options
Diffstat (limited to 'pkgs/desktops')
14 files changed, 85 insertions, 54 deletions
diff --git a/pkgs/desktops/lxqt/lxqt-config/default.nix b/pkgs/desktops/lxqt/lxqt-config/default.nix index 60e6ca3d4e8..745c4e71b5e 100644 --- a/pkgs/desktops/lxqt/lxqt-config/default.nix +++ b/pkgs/desktops/lxqt/lxqt-config/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , cmake , pkg-config +, glib , lxqt-build-tools , qtbase , qtx11extras @@ -34,6 +35,7 @@ mkDerivation rec { ]; buildInputs = [ + glib.bin qtbase qtx11extras qttools @@ -51,6 +53,12 @@ mkDerivation rec { xorg.xf86inputlibinput.dev ]; + postPatch = '' + substituteInPlace lxqt-config-appearance/configothertoolkits.cpp \ + --replace 'QStringLiteral("gsettings' \ + 'QStringLiteral("${glib.bin}/bin/gsettings' + ''; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { diff --git a/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/pkgs/desktops/pantheon/apps/elementary-code/default.nix index 8516133b18d..df448079c5a 100644 --- a/pkgs/desktops/pantheon/apps/elementary-code/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-code/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , pantheon , pkg-config @@ -31,7 +30,7 @@ stdenv.mkDerivation rec { pname = "elementary-code"; - version = "6.0.0"; + version = "6.0.1"; repoName = "code"; @@ -39,18 +38,9 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "1w1m52mq3zr9alkxk1c0s4ncscka1km5ppd0r6zm86qan9cjwq0f"; + sha256 = "120328pprzqj4587yj54yya9v2mv1rfwylpmxyr5l2qf80cjxi9d"; }; - patches = [ - # Upstream code not respecting our localedir - # https://github.com/elementary/code/pull/1090 - (fetchpatch { - url = "https://github.com/elementary/code/commit/88dc40d7bbcc2288ada6673eb8f4fab345d97882.patch"; - sha256 = "16y20bvslcm390irlib759703lvf7w6rz4xzaiazjj1r1njwinvv"; - }) - ]; - passthru = { updateScript = nix-update-script { attrPath = "pantheon.${pname}"; diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix index dcdd1bb9ace..9ac17741745 100644 --- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { pname = "elementary-files"; - version = "6.0.2"; + version = "6.0.3"; repoName = "files"; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "1i514r3adypmcwinmv4c1kybims16xi4i3akx0yy04dib92hbk7c"; + sha256 = "10hgj5rrqxzk4q8jlhkwwrs4hgyavlhz3z1pqf36y663bq3h0izv"; }; passthru = { diff --git a/pkgs/desktops/pantheon/apps/elementary-mail/default.nix b/pkgs/desktops/pantheon/apps/elementary-mail/default.nix index 6d0b752c1d1..743ed40d6dc 100644 --- a/pkgs/desktops/pantheon/apps/elementary-mail/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-mail/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { pname = "elementary-mail"; - version = "6.1.1"; + version = "6.2.0"; repoName = "mail"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "15ai0x9236pjx76m0756nyc1by78v0lg1dgdiifk868krdvipzzx"; + sha256 = "1ab620zhwqqjq1bs1alvpcw9jmdxjij0ywczvwbg8gqvcsc80lkn"; }; passthru = { diff --git a/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix b/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix index bec0556a377..545a21ba200 100644 --- a/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { pname = "elementary-tasks"; - version = "6.0.3"; + version = "6.0.4"; repoName = "tasks"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "0a6zgf7di4jyl764pn78wbanm0i5vrkk5ks3cfsvi3baprf3j9d5"; + sha256 = "1gb51gm8qgd8yzhqb7v69p2f1fgm3qf534if4lc85jrjsb8hgmhl"; }; passthru = { diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix index 3b3cbf64ef8..22c2f4f64af 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , pantheon , meson @@ -16,24 +15,15 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-applications"; - version = "6.0.0"; + version = "6.0.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "0hgvmrgg6g2sjb3sda7kzfcd3zgngd5w982drl6ll44k1mh16gsj"; + sha256 = "18izmzhqp6x5ivha9yl8gyz9adyrsylw7w5p0cwm1bndgqbi7yh5"; }; - patches = [ - # Upstream code not respecting our localedir - # https://github.com/elementary/switchboard-plug-applications/pull/163 - (fetchpatch { - url = "https://github.com/elementary/switchboard-plug-applications/commit/25db490654ab41694be7b7ba19218376f42fbb8d.patch"; - sha256 = "16y8zcwnnjsh72ifpyqcdb9f5ajdj0iy8kb5sj6v77c1cxdhrv29"; - }) - ]; - passthru = { updateScript = nix-update-script { attrPath = "pantheon.${pname}"; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix index 9aa9d7e6780..5e8447f629a 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-onlineaccounts"; - version = "6.2.0"; + version = "6.2.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "1lp3i31jzp21n43d1mh4d4i8zgim3q3j4inw4hmyimyql2s83cc3"; + sha256 = "1q3f7zr04p2100mb255zy38il2i47l6vqdc9a9acjbk3n7q5sf92"; }; passthru = { diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix index 3f674075133..665007fcd63 100644 --- a/pkgs/desktops/pantheon/desktop/gala/default.nix +++ b/pkgs/desktops/pantheon/desktop/gala/default.nix @@ -75,6 +75,11 @@ stdenv.mkDerivation rec { patches = [ ./plugins-dir.patch + # https://github.com/elementary/gala/pull/1259 + # https://github.com/NixOS/nixpkgs/issues/139404 + # Remove this patch when it is included in a new release + # of gala OR when we no longer use mutter 3.38 for pantheon + ./fix-session-crash-when-taking-screenshots.patch ]; postPatch = '' diff --git a/pkgs/desktops/pantheon/desktop/gala/fix-session-crash-when-taking-screenshots.patch b/pkgs/desktops/pantheon/desktop/gala/fix-session-crash-when-taking-screenshots.patch new file mode 100644 index 00000000000..f2393a804bc --- /dev/null +++ b/pkgs/desktops/pantheon/desktop/gala/fix-session-crash-when-taking-screenshots.patch @@ -0,0 +1,50 @@ +From fa3c39331d4ef56a13019f45d811bde1fc755c21 Mon Sep 17 00:00:00 2001 +From: Bobby Rong <rjl931189261@126.com> +Date: Sat, 25 Sep 2021 23:21:01 +0800 +Subject: [PATCH] Fix session crash when taking screenshots with mutter 3.38 + +--- + src/ScreenshotManager.vala | 5 ++--- + vapi/mutter-clutter.vapi | 2 +- + 2 files changed, 3 insertions(+), 4 deletions(-) + +diff --git a/src/ScreenshotManager.vala b/src/ScreenshotManager.vala +index 3ffb0123..388fee1a 100644 +--- a/src/ScreenshotManager.vala ++++ b/src/ScreenshotManager.vala +@@ -354,12 +354,11 @@ namespace Gala { + paint_flags |= Clutter.PaintFlag.FORCE_CURSORS; + } + +- unowned var data = image.get_data (); + if (GLib.ByteOrder.HOST == GLib.ByteOrder.LITTLE_ENDIAN) { + wm.stage.paint_to_buffer ( + {x, y, width, height}, + scale, +- ref data, ++ image.get_data (), + image.get_stride (), + Cogl.PixelFormat.BGRA_8888_PRE, + paint_flags +@@ -368,7 +367,7 @@ namespace Gala { + wm.stage.paint_to_buffer ( + {x, y, width, height}, + scale, +- ref data, ++ image.get_data (), + image.get_stride (), + Cogl.PixelFormat.ARGB_8888_PRE, + paint_flags +diff --git a/vapi/mutter-clutter.vapi b/vapi/mutter-clutter.vapi +index 5b778cb2..95de24be 100644 +--- a/vapi/mutter-clutter.vapi ++++ b/vapi/mutter-clutter.vapi +@@ -7336,7 +7336,7 @@ namespace Clutter { + [Version (since = "1.2")] + public bool get_use_alpha (); + #if HAS_MUTTER338 +- public bool paint_to_buffer (Cairo.RectangleInt rect, float scale, [CCode (array_length = false)] ref unowned uint8[] data, int stride, Cogl.PixelFormat format, Clutter.PaintFlag paint_flags) throws GLib.Error; ++ public bool paint_to_buffer (Cairo.RectangleInt rect, float scale, [CCode (array_length = false, type = "uint8_t*")] uint8[] data, int stride, Cogl.PixelFormat format, Clutter.PaintFlag paint_flags) throws GLib.Error; + public void paint_to_framebuffer (Cogl.Framebuffer framebuffer, Cairo.RectangleInt rect, float scale, Clutter.PaintFlag paint_flags); + #else + [Version (since = "0.4")] diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix index 29432bf1965..6799887247d 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix @@ -12,7 +12,6 @@ , libgee , gettext , gtk3 -, appstream , gnome-menus , json-glib , elementary-dock @@ -27,7 +26,7 @@ stdenv.mkDerivation rec { pname = "wingpanel-applications-menu"; - version = "2.8.2"; + version = "2.9.0"; repoName = "applications-menu"; @@ -35,7 +34,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "1pm3dnq35vbvyxqapmfy4frfwhc1l2zh634annlmbjiyfp5mzk0q"; + sha256 = "0mwjw2ghbdj336ax5srxbqnjprdhj1if7sm9k9idqkmifpzccs7i"; }; passthru = { @@ -45,7 +44,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - appstream gettext meson ninja diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix index 1a101a8a886..46d90e4acc3 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix @@ -3,7 +3,6 @@ , nix-update-script , pantheon , pkg-config -, fetchpatch , meson , ninja , vala @@ -17,24 +16,15 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-notifications"; - version = "6.0.0"; + version = "6.0.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "1pvcpk1d2zh9pvw0clv3bhf2plcww6nbxs6j7xjbvnaqs7d6i1k2"; + sha256 = "1qrbg8l3ifz09jx6v5j7hmgw0hmirj6mh3z634yl1cadz45p8fc9"; }; - patches = [ - # Upstream code not respecting our localedir - # https://github.com/elementary/wingpanel-indicator-notifications/pull/218 - (fetchpatch { - url = "https://github.com/elementary/wingpanel-indicator-notifications/commit/c7e73f0683561345935a959dafa2083b7e22fe99.patch"; - sha256 = "10xiyq42bqfmih1jgqpq64nha3n0y7ra3j7j0q27rn5hhhgbyjs7"; - }) - ]; - passthru = { updateScript = nix-update-script { attrPath = "pantheon.${pname}"; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix index 1ae9f9f4aaa..4529b519bb0 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "wingpanel"; - version = "3.0.0"; + version = "3.0.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "0ycys24y1rrz0ydpvs4mc89p4k986q1ziwbvziinxr1wsli9v1dj"; + sha256 = "078yi36r452sc33mv2ck8z0icya1lhzhickllrlhc60rdri36sb8"; }; passthru = { diff --git a/pkgs/desktops/xfce/applications/xfdashboard/default.nix b/pkgs/desktops/xfce/applications/xfdashboard/default.nix index 527696c995e..bee7f513608 100644 --- a/pkgs/desktops/xfce/applications/xfdashboard/default.nix +++ b/pkgs/desktops/xfce/applications/xfdashboard/default.nix @@ -17,11 +17,11 @@ mkXfceDerivation { category = "apps"; pname = "xfdashboard"; - version = "0.9.3"; + version = "0.9.4"; rev-prefix = ""; odd-unstable = false; - sha256 = "sha256-xoeqVsfvBH2zzQqDUJGiA47hgVvEkvVf9bNYQmyiytk="; + sha256 = "sha256-ZDrBLSfRBw5/nIs/x1jJQCVgNJer85b8Hm1kkX1Dk3s="; buildInputs = [ clutter diff --git a/pkgs/desktops/xfce/core/thunar/default.nix b/pkgs/desktops/xfce/core/thunar/default.nix index 42c0f1ef674..2672da6ad37 100644 --- a/pkgs/desktops/xfce/core/thunar/default.nix +++ b/pkgs/desktops/xfce/core/thunar/default.nix @@ -21,9 +21,9 @@ let unwrapped = mkXfceDerivation { category = "xfce"; pname = "thunar"; - version = "4.16.9"; + version = "4.16.10"; - sha256 = "sha256-TpazNC4TwNhcEGQ4AQICxbmfZ1i4RE9vXkM9Zln80vE="; + sha256 = "sha256-BeEy8+zEsJ5fJAbvP37tfekqF5LTHil0RDcE5RY0f64="; nativeBuildInputs = [ docbook_xsl |