summary refs log tree commit diff
path: root/pkgs/desktops/pantheon
diff options
context:
space:
mode:
authorworldofpeace <worldofpeace@protonmail.ch>2020-03-30 02:37:16 -0400
committerworldofpeace <worldofpeace@protonmail.ch>2020-04-06 02:48:07 -0400
commit53bea3717f1f1fd7ab49cc2e4b7913b6c9e85989 (patch)
tree77c6a8c75d9cff57ee6b8b65139e591a90e08bfa /pkgs/desktops/pantheon
parent741313d01ba48336195c6108da4b9302b20ec748 (diff)
downloadnixpkgs-53bea3717f1f1fd7ab49cc2e4b7913b6c9e85989.tar
nixpkgs-53bea3717f1f1fd7ab49cc2e4b7913b6c9e85989.tar.gz
nixpkgs-53bea3717f1f1fd7ab49cc2e4b7913b6c9e85989.tar.bz2
nixpkgs-53bea3717f1f1fd7ab49cc2e4b7913b6c9e85989.tar.lz
nixpkgs-53bea3717f1f1fd7ab49cc2e4b7913b6c9e85989.tar.xz
nixpkgs-53bea3717f1f1fd7ab49cc2e4b7913b6c9e85989.tar.zst
nixpkgs-53bea3717f1f1fd7ab49cc2e4b7913b6c9e85989.zip
pantheon.elementary-session-settings: add g-s-d version mappings
Needed to have a correct pantheon.session gnome-session file.
Diffstat (limited to 'pkgs/desktops/pantheon')
-rw-r--r--pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix17
1 files changed, 16 insertions, 1 deletions
diff --git a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
index ffe1ea4714d..c22444422be 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
@@ -1,5 +1,6 @@
 { stdenv
 , fetchFromGitHub
+, fetchpatch
 , substituteAll
 , writeScript
 , pantheon
@@ -15,7 +16,7 @@
 , writeText
 , meson
 , ninja
-, git
+, pkg-config
 }:
 
 let
@@ -80,9 +81,23 @@ stdenv.mkDerivation rec {
     sha256 = "0n1m41aapr58rb1ffvfkjq6c6w3f0ynjzzhja50s4di98p4m7y0q";
   };
 
+  patches = [
+    # Map Pantheon required components by g-s-d versions
+    # https://github.com/elementary/session-settings/pull/23
+    (fetchpatch {
+      url = "https://github.com/elementary/session-settings/commit/39918f4ec64fa9ed5affa109d6a692b97ae4ff01.patch";
+      sha256 = "0v2kqcsibymnslnnw4v67yh098znsrhrcycgxkw8vymvwlinc502";
+    })
+  ];
+
   nativeBuildInputs = [
     meson
     ninja
+    pkg-config
+  ];
+
+  buildInputs = [
+    elementary-settings-daemon
   ];
 
   mesonFlags = [