refactor: reuse nixgl.auto when nVidia is forced

Instead of duplicating its definition, because that leaves the possibility for bugs when these duplicates aren't in sync.
nix-community · Apr 22, 2024 · 12f8b90 · 12f8b90
1 parent 378c68e
commit 12f8b90
Showing 1 changed file with 2 additions and 7 deletions.
diff --git a/nixGL.nix b/nixGL.nix
@@ -249,10 +249,5 @@ let
         nixGLCommon nixGLIntel;
     } // autoNvidia;
   };
-in top // (if nvidiaVersion != null then
-  top.nvidiaPackages {
-    version = nvidiaVersion;
-    sha256 = nvidiaHash;
-  }
-else
-  { })
+in top // lib.optionalAttrs (nvidiaVersion != null)
+(builtins.removeAttrs top.auto [ "nixGLDefault" ])