From 66dc9dbb59f03975a9d2f4940f2f2bf9867e09d6 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sun, 17 Jan 2021 21:14:59 +0100 Subject: nixos/modules: stdenv.lib -> lib --- nixos/modules/config/gnu.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'nixos/modules/config/gnu.nix') diff --git a/nixos/modules/config/gnu.nix b/nixos/modules/config/gnu.nix index 93d13097019..255d9741ba7 100644 --- a/nixos/modules/config/gnu.nix +++ b/nixos/modules/config/gnu.nix @@ -1,11 +1,9 @@ { config, lib, pkgs, ... }: -with lib; - { options = { - gnu = mkOption { - type = types.bool; + gnu = lib.mkOption { + type = lib.types.bool; default = false; description = '' When enabled, GNU software is chosen by default whenever a there is @@ -15,7 +13,7 @@ with lib; }; }; - config = mkIf config.gnu { + config = lib.mkIf config.gnu { environment.systemPackages = with pkgs; # TODO: Adjust `requiredPackages' from `system-path.nix'. @@ -26,7 +24,7 @@ with lib; nano zile texinfo # for the stand-alone Info reader ] - ++ stdenv.lib.optional (!stdenv.isAarch32) grub2; + ++ lib.optional (!stdenv.isAarch32) grub2; # GNU GRUB, where available. -- cgit 1.4.1