From d0379a8673605ac300a539479e8cfc0ea0a010df Mon Sep 17 00:00:00 2001 From: zimbatm Date: Tue, 28 Apr 2020 11:37:37 +0200 Subject: [PATCH] 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. --- default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/default.nix b/default.nix index f1d544d..7455b30 100644 --- 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 -}: - -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 { + config = { allowUnfree = true; }; } +}: +pkgs.callPackage ./nixGL.nix { + inherit nvidiaVersion nvidiaHash enable32bits; +}