about summary refs log tree commit diff
path: root/pkgs/desktops
diff options
context:
space:
mode:
authorBobby Rong <rjl931189261@126.com>2023-10-07 00:07:27 +0800
committerGitHub <noreply@github.com>2023-10-07 00:07:27 +0800
commita6f6d246400c27300ff7956bc812816d10657fc1 (patch)
treef7744772cce1790b14c14d1ce66829d8807aa68e /pkgs/desktops
parent3374d2af40c2928350c07af13a8ae3e8f8cf732d (diff)
parent9a9e44ca048887ba5151c87853bd5f884e9b5d74 (diff)
downloadnixlib-a6f6d246400c27300ff7956bc812816d10657fc1.tar
nixlib-a6f6d246400c27300ff7956bc812816d10657fc1.tar.gz
nixlib-a6f6d246400c27300ff7956bc812816d10657fc1.tar.bz2
nixlib-a6f6d246400c27300ff7956bc812816d10657fc1.tar.lz
nixlib-a6f6d246400c27300ff7956bc812816d10657fc1.tar.xz
nixlib-a6f6d246400c27300ff7956bc812816d10657fc1.tar.zst
nixlib-a6f6d246400c27300ff7956bc812816d10657fc1.zip
Merge pull request #259403 from bobby285271/upd/pantheon
pantheon.elementary-default-settings: Backport pantheon-portals.conf support
Diffstat (limited to 'pkgs/desktops')
-rw-r--r--pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix10
1 files changed, 10 insertions, 0 deletions
diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix
index 9b832ccde44a..dedf372d6e80 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix
@@ -1,6 +1,7 @@
 { lib
 , stdenv
 , fetchFromGitHub
+, fetchpatch
 , nix-update-script
 , meson
 , ninja
@@ -23,6 +24,15 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-j4K8qYwfu6/s4qnTSzwv6KRsk9f+Qr/l1bhLywKMHMU=";
   };
 
+  patches = [
+    # Add pantheon-portals.conf
+    # https://github.com/elementary/default-settings/pull/293
+    (fetchpatch {
+      url = "https://github.com/elementary/default-settings/commit/8201eeb6a356e6059b505756ef7a556a6848ad3b.patch";
+      sha256 = "sha256-qhGj7WQTAWJTC1kouUZhBWKqyO4hQWJghEhLVl8QVUM=";
+    })
+  ];
+
   nativeBuildInputs = [
     accountsservice
     dbus