summary refs log tree commit diff
path: root/pkgs/applications/window-managers/phosh/default.nix
diff options
context:
space:
mode:
authorWeijia Wang <9713184+wegank@users.noreply.github.com>2022-08-02 15:05:26 +0200
committerWeijia Wang <9713184+wegank@users.noreply.github.com>2022-08-02 15:05:26 +0200
commitfa60985d57fce0fdd7f23967339cc4baf6a68074 (patch)
tree4838800367e70d88f64a6fa1531d8bb6cb69160f /pkgs/applications/window-managers/phosh/default.nix
parentefb7405702e62f6edbdcfcacd2ce3e56aa9de40a (diff)
downloadnixpkgs-fa60985d57fce0fdd7f23967339cc4baf6a68074.tar
nixpkgs-fa60985d57fce0fdd7f23967339cc4baf6a68074.tar.gz
nixpkgs-fa60985d57fce0fdd7f23967339cc4baf6a68074.tar.bz2
nixpkgs-fa60985d57fce0fdd7f23967339cc4baf6a68074.tar.lz
nixpkgs-fa60985d57fce0fdd7f23967339cc4baf6a68074.tar.xz
nixpkgs-fa60985d57fce0fdd7f23967339cc4baf6a68074.tar.zst
nixpkgs-fa60985d57fce0fdd7f23967339cc4baf6a68074.zip
phosh: fix build
Diffstat (limited to 'pkgs/applications/window-managers/phosh/default.nix')
-rw-r--r--pkgs/applications/window-managers/phosh/default.nix16
1 files changed, 15 insertions, 1 deletions
diff --git a/pkgs/applications/window-managers/phosh/default.nix b/pkgs/applications/window-managers/phosh/default.nix
index 6a37809bb5f..11a5c9b56ca 100644
--- a/pkgs/applications/window-managers/phosh/default.nix
+++ b/pkgs/applications/window-managers/phosh/default.nix
@@ -1,6 +1,7 @@
 { lib
 , stdenv
 , fetchFromGitLab
+, fetchpatch
 , meson
 , ninja
 , pkg-config
@@ -84,6 +85,19 @@ stdenv.mkDerivation rec {
 
   mesonFlags = [ "-Dsystemd=true" "-Dcompositor=${phoc}/bin/phoc" ];
 
+  patches = [
+    # build: Adjust to polkit version changes
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/World/Phosh/phosh/-/commit/16b46e295b86cbf1beaccf8218cf65ebb4b7a6f1.patch";
+      sha256 = "sha256-Db1OEdiI1QBHGEBs1Coi7LTF9bCScdDgxmovpBdIY/g=";
+    })
+    # polkit-auth-agent: Scope cleanup function for PolkitAgentListener
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/World/Phosh/phosh/-/commit/b864653df50bfd8f34766fc6b37a3bf32cfbdfa4.patch";
+      sha256 = "sha256-YCw3tGk94NAa6PPTmA1lCJVzzi9GC74BmvtTcvuHPh0=";
+    })
+  ];
+
   postPatch = ''
     chmod +x build-aux/post_install.py
     patchShebangs build-aux/post_install.py
@@ -113,7 +127,7 @@ stdenv.mkDerivation rec {
 
   passthru = {
     providedSessions = [
-     "sm.puri.Phosh"
+      "sm.puri.Phosh"
     ];
   };