From 25ca62c2a2d9cadb0352882ef9cd8a1a1e79671e Mon Sep 17 00:00:00 2001 From: toonn Date: Sat, 8 Aug 2020 21:15:08 +0200 Subject: [PATCH] joypixels: Switch from override to config option Switch from an overridden variable to an option specified in configuration.nix or config.nix: ``` joypixels.acceptLicense = true; ``` --- pkgs/data/fonts/joypixels/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/data/fonts/joypixels/default.nix b/pkgs/data/fonts/joypixels/default.nix index eb9bc5cf910d..2b39595f0e16 100644 --- a/pkgs/data/fonts/joypixels/default.nix +++ b/pkgs/data/fonts/joypixels/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, acceptLicense ? false }: +{ stdenv, fetchurl, config +, acceptLicense ? config.joypixels.acceptLicense or false +}: let inherit (stdenv.hostPlatform) system; @@ -40,8 +42,9 @@ assert !acceptLicense -> throw '' - ${joypixels-free-license.fullName} [1] - ${joypixels-license-appendix.fullName} [2] - You can express acceptance by overriding acceptLicense: - (joypixels.override { acceptLicense = true; }) + You can express acceptance by setting acceptLicense to true in your + configuration (configuration.nix or config.nix): + joypixels.acceptLicense = true; [1]: ${joypixels-free-license.url} [2]: ${joypixels-license-appendix.url}