fix gnome keyring

bpaulin · Nov 18, 2022 · dc335e8 · dc335e8
1 parent fcc28d6
commit dc335e8
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 0 deletions.
diff --git a/modules/laptops/display/gnome/default.nix b/modules/laptops/display/gnome/default.nix
@@ -1,5 +1,9 @@
 { ... }:
 {
+  # until https://github.com/NixOS/nixpkgs/pull/201229/commits/808095530a618c70e81c9f2423273860cfbed4d0 is on master
+  nixpkgs.overlays = [
+    (import ../../../../pkgs/overlays/gnome-keyring.nix)
+  ];
 
   services.xserver.desktopManager.gnome.enable = true;
 

diff --git a/modules/laptops/mess.nix b/modules/laptops/mess.nix
@@ -1,5 +1,9 @@
 { pkgs, ... }:
 {
+  nixpkgs.overlays = [
+    # (import ../../pkgs/overlays/OVERLAY.nix)
+  ];
+
   environment.systemPackages = with pkgs; [
     # packages
   ];

diff --git a/pkgs/overlays/gnome-keyring.nix b/pkgs/overlays/gnome-keyring.nix
@@ -0,0 +1,16 @@
+# until https://github.com/NixOS/nixpkgs/pull/201229/commits/808095530a618c70e81c9f2423273860cfbed4d0 is on master
+final: prev: {
+  gnome = prev.gnome // {
+    gnome-keyring = (prev.gnome.gnome-keyring.override {
+      glib = prev.glib.overrideAttrs (a: rec {
+        patches = a.patches ++ [
+          (final.fetchpatch {
+            url =
+              "https://gitlab.gnome.org/GNOME/glib/-/commit/2a36bb4b7e46f9ac043561c61f9a790786a5440c.patch";
+            sha256 = "b77Hxt6WiLxIGqgAj9ZubzPWrWmorcUOEe/dp01BcXA=";
+          })
+        ];
+      });
+    });
+  };
+}