diff options
20 files changed, 157 insertions, 192 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index 178d6f1fb7c..8155a1844e1 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -227,8 +227,10 @@ in environment.sessionVariables.GTK_CSD = "1"; environment.etc."gtk-3.0/settings.ini".source = "${pkgs.pantheon.elementary-default-settings}/etc/gtk-3.0/settings.ini"; - xdg.portal.extraPortals = [ - pkgs.pantheon.elementary-files + xdg.portal.extraPortals = with pkgs; [ + pantheon.elementary-files + pantheon.elementary-settings-daemon + xdg-desktop-portal-pantheon ]; # Override GSettings schemas diff --git a/pkgs/applications/misc/tootle/default.nix b/pkgs/applications/misc/tootle/default.nix index 63ac88ecac9..8c111ae6aa4 100644 --- a/pkgs/applications/misc/tootle/default.nix +++ b/pkgs/applications/misc/tootle/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , nix-update-script , fetchpatch -, vala +, vala_0_52 , meson , ninja , pkg-config @@ -35,7 +35,9 @@ stdenv.mkDerivation rec { ninja pkg-config python3 - vala + # Does not build with vala 0.54 + # https://github.com/bleakgrey/tootle/issues/337 + vala_0_52 wrapGAppsHook ]; diff --git a/pkgs/desktops/gnome/core/epiphany/default.nix b/pkgs/desktops/gnome/core/epiphany/default.nix index 617ef1cc38f..6f996552064 100644 --- a/pkgs/desktops/gnome/core/epiphany/default.nix +++ b/pkgs/desktops/gnome/core/epiphany/default.nix @@ -3,6 +3,7 @@ , ninja , gettext , fetchurl +, fetchpatch , pkg-config , gtk3 , glib @@ -46,12 +47,30 @@ stdenv.mkDerivation rec { sha256 = "s50YJUkllbC3TF1qZoaoV/lBnfpMAvgBPCl7yHDibdA="; }; - patches = lib.optionals withPantheon [ - # Make this respect dark mode settings from Pantheon + patches = [ + # tab-view: Update close button position on startup + # https://gitlab.gnome.org/GNOME/epiphany/-/merge_requests/1025 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/epiphany/-/commit/6e9d6d3cf7fa7ddf21a70e9816a5cd4767a79523.patch"; + sha256 = "sha256-lBVliGCIKwTvsYnWjAcmJxhTg1HS/2x4wlOh+4sx/xQ="; + }) + ] ++ lib.optionals withPantheon [ + # Pantheon specific patches for epiphany # https://github.com/elementary/browser - # The patch currently differs from upstream (updated for epiphany 40 and 41). - ./pantheon-dark-style.patch - ./pantheon-navigation-buttons.patch + # + # Make this respect dark mode settings from Pantheon + # https://github.com/elementary/browser/pull/21 + # https://github.com/elementary/browser/pull/41 + (fetchpatch { + url = "https://raw.githubusercontent.com/elementary/browser/cc17559a7ac6effe593712b4f3d0bbefde6e3b62/dark-style.patch"; + sha256 = "sha256-RzMUc9P51UN3tRFefzRtMniXR9duOOmLj5eu5gL2TEQ="; + }) + # Patch to unlink nav buttons + # https://github.com/elementary/browser/pull/18 + (fetchpatch { + url = "https://raw.githubusercontent.com/elementary/browser/cc17559a7ac6effe593712b4f3d0bbefde6e3b62/navigation-buttons.patch"; + sha256 = "sha256-G1/JUjn/8DyO9sgL/5Kq205KbTOs4EMi4Vf3cJ8FHXU="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/core/epiphany/pantheon-dark-style.patch b/pkgs/desktops/gnome/core/epiphany/pantheon-dark-style.patch deleted file mode 100644 index 56ac5c1e5b2..00000000000 --- a/pkgs/desktops/gnome/core/epiphany/pantheon-dark-style.patch +++ /dev/null @@ -1,76 +0,0 @@ -diff --git a/meson.build b/meson.build -index de9cbfa850..647f617605 100644 ---- a/meson.build -+++ b/meson.build -@@ -92,6 +92,7 @@ iso_codes_dep = dependency('iso-codes', version: '>= 0.35') - json_glib_dep = dependency('json-glib-1.0', version: '>= 1.6') - libarchive_dep = dependency('libarchive') - libdazzle_dep = dependency('libdazzle-1.0', version: '>= 3.37.1') -+libgranite_dep = dependency('granite', version: '>= 6.0.0') - libhandy_dep = dependency('libhandy-1', version: '>= 1.1.0') - libsecret_dep = dependency('libsecret-1', version: '>= 0.19.0') - libsoup_dep = dependency('libsoup-2.4', version: '>= 2.48.0') -diff --git a/src/ephy-shell.c b/src/ephy-shell.c -index 650531da86..b9d1355e86 100644 ---- a/src/ephy-shell.c -+++ b/src/ephy-shell.c -@@ -50,6 +50,7 @@ - - #include <glib/gi18n.h> - #include <gtk/gtk.h> -+#include <granite.h> - #include <handy.h> - - struct _EphyShell { -@@ -483,6 +484,20 @@ run_in_background_set_mapping (const GValue *value, - return g_variant_new_boolean (g_variant_get_boolean (var)); - } - -+static void -+ephy_shell_set_prefers_color_scheme (EphyShell *shell) -+{ -+ GtkSettings* gtk_settings = gtk_settings_get_default (); -+ GraniteSettings* granite_settings = granite_settings_get_default (); -+ -+ g_object_set ( -+ gtk_settings, -+ "gtk-application-prefer-dark-theme", -+ granite_settings_get_prefers_color_scheme (granite_settings) == GRANITE_SETTINGS_COLOR_SCHEME_DARK, -+ NULL -+ ); -+} -+ - static void - ephy_shell_startup (GApplication *application) - { -@@ -490,11 +505,18 @@ ephy_shell_startup (GApplication *application) - EphyShell *shell = EPHY_SHELL (application); - EphyEmbedShellMode mode; - GAction *action; -+ GraniteSettings* granite_settings = granite_settings_get_default (); - - G_APPLICATION_CLASS (ephy_shell_parent_class)->startup (application); - - hdy_init (); - -+ ephy_shell_set_prefers_color_scheme (shell); -+ -+ g_signal_connect (granite_settings, "notify::prefers-color-scheme", -+ G_CALLBACK (ephy_shell_set_prefers_color_scheme), shell -+ ); -+ - /* If we are under Pantheon set the icon-theme and cursor-theme accordingly. */ - if (is_desktop_pantheon ()) { - GtkSettings *settings = gtk_settings_get_default (); -diff --git a/src/meson.build b/src/meson.build -index 5bf3eb92ec..d17b1b6d93 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -74,6 +74,7 @@ libephymain_deps = [ - gdk_dep, - gvdb_dep, - libarchive_dep, -+ libgranite_dep, - libhandy_dep - ] - diff --git a/pkgs/desktops/gnome/core/epiphany/pantheon-navigation-buttons.patch b/pkgs/desktops/gnome/core/epiphany/pantheon-navigation-buttons.patch deleted file mode 100644 index b7b3b620535..00000000000 --- a/pkgs/desktops/gnome/core/epiphany/pantheon-navigation-buttons.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/resources/gtk/action-bar-start.ui b/src/resources/gtk/action-bar-start.ui -index e604b9601f..2bfe244d53 100644 ---- a/src/resources/gtk/action-bar-start.ui -+++ b/src/resources/gtk/action-bar-start.ui -@@ -7,7 +7,6 @@ - <property name="visible">True</property> - <property name="orientation">horizontal</property> - <style> -- <class name="linked"/> - <class name="navigation-box"/> - </style> - <child> diff --git a/pkgs/desktops/pantheon/apps/appcenter/default.nix b/pkgs/desktops/pantheon/apps/appcenter/default.nix index 86580bd4c30..c8526c48988 100644 --- a/pkgs/desktops/pantheon/apps/appcenter/default.nix +++ b/pkgs/desktops/pantheon/apps/appcenter/default.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { pname = "appcenter"; - version = "3.8.0"; + version = "3.8.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "07lkdpnjj9pxbq8h794qjiidvnysvzx0132w98r1wg9k7ca170bj"; + sha256 = "sha256-d7DGyAC8itBxTfuabDPN16W4S4d42s5UPp8AusZfy5k="; }; patches = [ diff --git a/pkgs/desktops/pantheon/apps/appcenter/drop-homepage-banner.patch b/pkgs/desktops/pantheon/apps/appcenter/drop-homepage-banner.patch index 3e7aa3efc12..4841a7b3ee6 100644 --- a/pkgs/desktops/pantheon/apps/appcenter/drop-homepage-banner.patch +++ b/pkgs/desktops/pantheon/apps/appcenter/drop-homepage-banner.patch @@ -1,6 +1,6 @@ -From b1e09653d755ca6ffd03a1e3e67750e6bcc2bc6f Mon Sep 17 00:00:00 2001 +From c1916699cd388cc8d9968127e43ba955471623bf Mon Sep 17 00:00:00 2001 From: Bobby Rong <rjl931189261@126.com> -Date: Wed, 22 Sep 2021 11:54:48 +0800 +Date: Wed, 27 Oct 2021 09:33:15 +0800 Subject: [PATCH 2/2] Drop homepage banner --- @@ -8,7 +8,7 @@ Subject: [PATCH 2/2] Drop homepage banner 1 file changed, 1 insertion(+), 180 deletions(-) diff --git a/src/Views/Homepage.vala b/src/Views/Homepage.vala -index 576fc02c..80a1d221 100644 +index 52cb36cc..80a1d221 100644 --- a/src/Views/Homepage.vala +++ b/src/Views/Homepage.vala @@ -31,67 +31,12 @@ public class AppCenter.Homepage : AbstractView { @@ -193,7 +193,7 @@ index 576fc02c..80a1d221 100644 - } - } - -- if (!installed && !(package in packages_in_banner) && !package.is_explicit) { +- if (!installed && !(package in packages_in_banner)) { - var package_row = new AppCenter.Widgets.ListPackageRowGrid (package); - recently_updated_carousel.add (package_row); - } diff --git a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix index 7fbaa32dc39..de01821edd6 100644 --- a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "elementary-calculator"; - version = "1.7.0"; + version = "1.7.1"; repoName = "calculator"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "1kl2iximcmbk8inklb2xav7dp08lp5pn9xxa59327zw13gdy8fkf"; + sha256 = "sha256-GoQFWhEhUBVLYL1vsIIBMT8pKc0dK/ploiGfUtJAJQU="; }; passthru = { diff --git a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix index 549493966c1..744184cc3d2 100644 --- a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { pname = "elementary-calendar"; - version = "6.0.2"; + version = "6.0.3"; repoName = "calendar"; @@ -36,13 +36,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "16xp8gfgpyz9xpjsxm6jlk4skkknj65g0q4x0qvw9sg9f1p6a514"; - }; - - passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + sha256 = "sha256-+RQUiJLuCIbmcbtsOCfF9HYFrxtldZMbg2vg/a/IOaY="; }; nativeBuildInputs = [ @@ -78,6 +72,12 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; + meta = with lib; { description = "Desktop calendar app designed for elementary OS"; homepage = "https://github.com/elementary/calendar"; diff --git a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix index 432e5fdf00e..c8e6e4da37d 100644 --- a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { pname = "elementary-camera"; - version = "6.0.0"; + version = "6.0.1"; repoName = "camera"; @@ -33,13 +33,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "1z5c6pkc7psglxwzby5idsdxvplpi28ckjxrwdngnr22knfdcgag"; - }; - - passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + sha256 = "sha256-OdBinryF6XTcvtY4A1wdDVazjf/VritEGF97ts6d4RY="; }; nativeBuildInputs = [ @@ -75,6 +69,12 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; + meta = with lib; { description = "Camera app designed for elementary OS"; homepage = "https://github.com/elementary/camera"; diff --git a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix index efd59f6ca0f..0b51f6209dd 100644 --- a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , pantheon , meson @@ -35,7 +34,7 @@ stdenv.mkDerivation rec { pname = "elementary-photos"; - version = "2.7.2"; + version = "2.7.3"; repoName = "photos"; @@ -43,18 +42,9 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "1zq9zfsc987vvrzadw9xqi3rlbi4jv2s82axkgy7ijm3ibi58ddc"; + sha256 = "sha256-ja4ElW0FNm9oNyn+00SdI2Cxep6LyWTYM8Blc6bnuiY="; }; - patches = [ - # Fix build with vala 0.54 - # https://github.com/elementary/photos/pull/650 - (fetchpatch { - url = "https://github.com/elementary/photos/commit/bc7feca8caa4c8fc076a759a2d36e26e93c75596.patch"; - sha256 = "sha256-iOHYKV7rSAuMm4ZhoJWjlpu96zlxwTosQe+z/iEVFR8="; - }) - ]; - nativeBuildInputs = [ appstream desktop-file-utils 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 6799887247d..c2a4ad64ce9 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { pname = "wingpanel-applications-menu"; - version = "2.9.0"; + version = "2.9.1"; repoName = "applications-menu"; @@ -34,14 +34,15 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "0mwjw2ghbdj336ax5srxbqnjprdhj1if7sm9k9idqkmifpzccs7i"; + sha256 = "sha256-Q0ee8S8wWhK0Y16SWfE79Us6QD/oRE5Pxm3o//eb/po="; }; - passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; - }; + patches = [ + (substituteAll { + src = ./fix-paths.patch; + bc = "${bc}/bin/bc"; + }) + ]; nativeBuildInputs = [ gettext @@ -76,18 +77,17 @@ stdenv.mkDerivation rec { "--sysconfdir=${placeholder "out"}/etc" ]; - patches = [ - (substituteAll { - src = ./fix-paths.patch; - bc = "${bc}/bin/bc"; - }) - ]; - postPatch = '' chmod +x meson/post_install.py patchShebangs meson/post_install.py ''; + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; + meta = with lib; { description = "Lightweight and stylish app launcher for Pantheon"; homepage = "https://github.com/elementary/applications-menu"; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix index 92738df7b35..560d16111c5 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , substituteAll , pantheon @@ -14,18 +14,17 @@ , libnma , wingpanel , libgee -, elementary-capnet-assist }: stdenv.mkDerivation rec { pname = "wingpanel-indicator-network"; - version = "2.3.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "0q5ad2sj0nmigrh1rykb2kvik3hzibzyafdvkkmjd6y92145lwl1"; + sha256 = "sha256-xr1ZihWK8fU8M/rXRKk5dOjoQNe3aJO8ouKC/iVZ7Sk="; }; passthru = { @@ -50,19 +49,6 @@ stdenv.mkDerivation rec { wingpanel ]; - patches = [ - (substituteAll { - src = ./fix-paths.patch; - elementary_capnet_assist = elementary-capnet-assist; - }) - # Upstream code not respecting our localedir - # https://github.com/elementary/wingpanel-indicator-network/pull/228 - (fetchpatch { - url = "https://github.com/elementary/wingpanel-indicator-network/commit/eacc7d46a94a980005e87e38e6c943143a09692a.patch"; - sha256 = "1svg07fqmplchp1ass0h8qkr3g24pkw8dcsnd54ddmvnjzwrzz0a"; - }) - ]; - meta = with lib; { description = "Network Indicator for Wingpanel"; homepage = "https://github.com/elementary/wingpanel-indicator-network"; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/fix-paths.patch b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/fix-paths.patch deleted file mode 100644 index b98c50b3e49..00000000000 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/fix-paths.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/Indicator.vala b/src/Indicator.vala -index 83ce932a..f95ed142 100644 ---- a/src/Indicator.vala -+++ b/src/Indicator.vala -@@ -67,7 +67,7 @@ public class Network.Indicator : Wingpanel.Indicator { - - if (network_monitor.get_connectivity () == NetworkConnectivity.FULL || network_monitor.get_connectivity () == NetworkConnectivity.PORTAL) { - try { -- var appinfo = AppInfo.create_from_commandline ("io.elementary.capnet-assist", null, AppInfoCreateFlags.NONE); -+ var appinfo = AppInfo.create_from_commandline ("@elementary_capnet_assist@/bin/io.elementary.capnet-assist", null, AppInfoCreateFlags.NONE); - appinfo.launch (null, null); - } catch (Error e) { - warning ("%s\n", e.message); diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix index 46d90e4acc3..5adf2c7da6f 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix @@ -16,19 +16,13 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-notifications"; - version = "6.0.1"; + version = "6.0.2"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "1qrbg8l3ifz09jx6v5j7hmgw0hmirj6mh3z634yl1cadz45p8fc9"; - }; - - passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + sha256 = "sha256-ZuOZlfxtRq8ZcrXGe9wlFGwn2isdvMoXQveKKnEPFdo="; }; nativeBuildInputs = [ @@ -47,6 +41,12 @@ stdenv.mkDerivation rec { wingpanel ]; + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; + meta = with lib; { description = "Notifications Indicator for Wingpanel"; homepage = "https://github.com/elementary/wingpanel-indicator-notifications"; diff --git a/pkgs/desktops/pantheon/granite/default.nix b/pkgs/desktops/pantheon/granite/default.nix index 0e6d14d2425..b4476ef839d 100644 --- a/pkgs/desktops/pantheon/granite/default.nix +++ b/pkgs/desktops/pantheon/granite/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { pname = "granite"; - version = "6.1.1"; + version = "6.1.2"; outputs = [ "out" "dev" ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = pname; rev = version; - sha256 = "13c6xk014psvmll9qybdqviskllw4g150m2k4ikjbv59g0rfp7xq"; + sha256 = "sha256-d48KQH8uwkSZWQEFSq1BD+TVUi9PWVVtMjKYmleRW58="; }; passthru = { diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix index d1aaad42e2f..3b47ca3dc8d 100644 --- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix @@ -15,12 +15,13 @@ , gtk3 , granite , libgee +, systemd , wrapGAppsHook }: stdenv.mkDerivation rec { pname = "elementary-settings-daemon"; - version = "1.0.0"; + version = "1.1.0"; repoName = "settings-daemon"; @@ -28,7 +29,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "1masvy1f9z2cp8w5ajnhy4k9bzvzgfziqlm59bf146pdd2567hiw"; + sha256 = "sha256-1Xp1uJzDFuGZlhJhKj00cYtb4Q1syMAm+82fTOtk0VI="; }; nativeBuildInputs = [ @@ -50,6 +51,7 @@ stdenv.mkDerivation rec { gtk3 granite libgee + systemd ]; postPatch = '' diff --git a/pkgs/development/libraries/xdg-desktop-portal-pantheon/default.nix b/pkgs/development/libraries/xdg-desktop-portal-pantheon/default.nix new file mode 100644 index 00000000000..ec43ff179d4 --- /dev/null +++ b/pkgs/development/libraries/xdg-desktop-portal-pantheon/default.nix @@ -0,0 +1,63 @@ +{ lib +, stdenv +, fetchFromGitHub +, nix-update-script +, meson +, ninja +, pkg-config +, vala +, wrapGAppsHook +, glib +, gtk3 +, libhandy +, pantheon +, systemd +, vte +}: + +stdenv.mkDerivation rec { + pname = "xdg-desktop-portal-pantheon"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = "portals"; + rev = version; + sha256 = "sha256-uPZUeyyn7HZwcBksY6X5s1bpbIRwqdCNfZKnkynVD+8="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + vala + wrapGAppsHook + ]; + + buildInputs = [ + glib + gtk3 + libhandy + pantheon.granite + systemd + vte + ]; + + mesonFlags = [ + "-Dsystemduserunitdir=${placeholder "out"}/lib/systemd/user" + ]; + + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + + meta = with lib; { + description = "Backend implementation for xdg-desktop-portal for the Pantheon desktop environment"; + homepage = "https://github.com/elementary/portals"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.pantheon.members; + }; +} diff --git a/pkgs/tools/inputmethods/touchegg/default.nix b/pkgs/tools/inputmethods/touchegg/default.nix index 69d05ceaed1..a50770c7355 100644 --- a/pkgs/tools/inputmethods/touchegg/default.nix +++ b/pkgs/tools/inputmethods/touchegg/default.nix @@ -16,12 +16,12 @@ stdenv.mkDerivation rec { pname = "touchegg"; - version = "2.0.11"; + version = "2.0.12"; src = fetchFromGitHub { owner = "JoseExposito"; repo = pname; rev = version; - sha256 = "1zfiqs5vqlb6drnqx9nsmhgy8qc6svzr8zyjkqvwkpbgrc6ifap9"; + sha256 = "sha256-oJzehs7oLFTDn7GSm6bY/77tEfyEdlANn69EdCApdPA="; }; PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e5c4d6f174a..52c23d8e4c4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29045,6 +29045,8 @@ with pkgs; xdg-desktop-portal-gtk = callPackage ../development/libraries/xdg-desktop-portal-gtk { }; + xdg-desktop-portal-pantheon = callPackage ../development/libraries/xdg-desktop-portal-pantheon { }; + xdg-desktop-portal-wlr = callPackage ../development/libraries/xdg-desktop-portal-wlr { }; xdg-user-dirs = callPackage ../tools/X11/xdg-user-dirs { }; |