From 0e7885d2c8128e42417e8be4920cdcc77b433c38 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Sat, 20 Jun 2020 23:03:03 +0200
Subject: ...

---
 sif.nix | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/sif.nix b/sif.nix
index 3279d11d..8391e825 100644
--- a/sif.nix
+++ b/sif.nix
@@ -124,15 +124,26 @@
   nixpkgs.overlays = [
     (self: super: {
       linuxPackages_latest = super.linuxPackages_latest.extend (self: super: {
-        nvidia_x11 = super.nvidia_x11.overrideAttrs (attrs: {
-          patches = [
-            (pkgs.fetchpatch {
-              name = "nvidia-kernel-5.7.patch";
-              url = "https://gitlab.com/snippets/1965550/raw";
-              sha256 = "03iwxhkajk65phc0h5j7v4gr4fjj6mhxdn04pa57am5qax8i2g9w";
-            })
-          ];
-        });
+        nvidiaPackages = super.nvidiaPackages // {
+          stable = super.nvidiaPackages.stable.overrideAttrs (attrs: {
+            patches = [
+              (pkgs.fetchpatch {
+                name = "nvidia-kernel-5.7.patch";
+                url = "https://gitlab.com/snippets/1965550/raw";
+                sha256 = "03iwxhkajk65phc0h5j7v4gr4fjj6mhxdn04pa57am5qax8i2g9w";
+              })
+            ];
+
+            passthru = {
+              settings = pkgs.callPackage (import <nixpkgs/pkgs/os-specific/linux/nvidia-x11/settings.nix> self.nvidiaPackages.stable "15psxvd65wi6hmxmd2vvsp2v0m07axw613hb355nh15r1dpkr3ma") {
+                withGtk2 = true;
+                withGtk3 = false;
+              };
+
+              persistenced = pkgs.lib.mapNullable (hash: pkgs.callPackage (import <nixpkgs/pkgs/os-specific/linux/nvidia-x11/persistenced.nix> self.nvidiaPackages.stable hash) { }) "13izz9p2kg9g38gf57g3s2sw7wshp1i9m5pzljh9v82c4c22x1fw";
+            };
+          });
+        };
       });
     })
   ];
-- 
cgit v1.2.3