summary refs log tree commit diff
path: root/pkgs/desktops
diff options
context:
space:
mode:
authorworldofpeace <worldofpeace@protonmail.ch>2020-07-26 15:30:36 -0400
committerworldofpeace <worldofpeace@protonmail.ch>2020-07-26 15:30:36 -0400
commit6df7a93ce789cdc1f4dacc4c7359ea77b5cad8be (patch)
treeb1bc379d5d9050704ac652476df926a40ccd4f05 /pkgs/desktops
parentd0c08cf6aeb994f2aa5dff0193c7346f84924508 (diff)
downloadnixpkgs-6df7a93ce789cdc1f4dacc4c7359ea77b5cad8be.tar
nixpkgs-6df7a93ce789cdc1f4dacc4c7359ea77b5cad8be.tar.gz
nixpkgs-6df7a93ce789cdc1f4dacc4c7359ea77b5cad8be.tar.bz2
nixpkgs-6df7a93ce789cdc1f4dacc4c7359ea77b5cad8be.tar.lz
nixpkgs-6df7a93ce789cdc1f4dacc4c7359ea77b5cad8be.tar.xz
nixpkgs-6df7a93ce789cdc1f4dacc4c7359ea77b5cad8be.tar.zst
nixpkgs-6df7a93ce789cdc1f4dacc4c7359ea77b5cad8be.zip
pantheon.gala: fix build with latest vala
Diffstat (limited to 'pkgs/desktops')
-rw-r--r--pkgs/desktops/pantheon/desktop/gala/default.nix8
1 files changed, 8 insertions, 0 deletions
diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix
index 624a1bde61d..4519a2287f7 100644
--- a/pkgs/desktops/pantheon/desktop/gala/default.nix
+++ b/pkgs/desktops/pantheon/desktop/gala/default.nix
@@ -1,5 +1,6 @@
 { stdenv
 , fetchFromGitHub
+, fetchpatch
 , pantheon
 , pkgconfig
 , meson
@@ -69,6 +70,13 @@ stdenv.mkDerivation rec {
   ];
 
   patches = [
+    # https://github.com/elementary/gala/pull/869
+    # build failure in vala 0.48.7
+    # https://github.com/elementary/gala/pull/869#issuecomment-657147695
+    (fetchpatch {
+      url = "https://github.com/elementary/gala/commit/85d290c75eaa147b704ad34e6c67498071707ee8.patch";
+      sha256 = "19jkvmxidf453qfrxkvi35igxzfz2cm8srwkabvyn9wyd1yhiw0l";
+    })
     ./plugins-dir.patch
     ./use-new-notifications-default.patch
   ];