www

commit d0379a8673605ac300a539479e8cfc0ea0a010df
parent 3db9b5d12a58d1c049439c0888cee5ae783d93a0
Author: zimbatm <zimbatm@zimbatm.com>
Date:   Tue, 28 Apr 2020 11:37:37 +0200

break: change how nixpkgs is passed to the project

Evaluating nixpkgs is quite expensive and should be done only once if
possible. This allows to pass a correctly-configured instance of nixpkgs
(with allowUnfree = true).

Unfortunately this requires to break the current interface.

Diffstat:
M
default.nix
 | 
16
++++++++--------

1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/default.nix b/default.nix
@@ -8,12 +8,12 @@
   # This is one by default, you can switch it to off if you want to reduce a
   # bit the size of nixGL closure.
   enable32bits ? true,
-  pkgs ? import <nixpkgs>
-}:
-
-let
-  nixpkgs = pkgs {config = {allowUnfree = true;};};
-in
-  nixpkgs.callPackage ./nixGL.nix {
-    inherit nvidiaVersion nvidiaHash enable32bits;
+  # Make sure to enable config.allowUnfree to the instance of nixpkgs to be
+  # able to access the nvidia drivers.
+  pkgs ? import <nixpkgs> {
+    config = { allowUnfree = true; };
   }
+}:
+pkgs.callPackage ./nixGL.nix {
+  inherit nvidiaVersion nvidiaHash enable32bits;
+}