mirror of
https://github.com/aviallon/nixos-lib.git
synced 2026-04-05 17:27:50 +00:00
[Packages] fix issues with newer flake-utils-plus versions overriding nixpkgs.pkgs
Will probably drop flake-utils-plus in the future because of that.
This commit is contained in:
parent
b2e758f4c8
commit
0e3649ddee
3 changed files with 10 additions and 4 deletions
10
packages.nix
10
packages.nix
|
|
@ -27,13 +27,19 @@ in
|
|||
description = "Allow specific unfree software to be installed";
|
||||
type = types.listOf types.str;
|
||||
};
|
||||
config = mkOption {
|
||||
default = {};
|
||||
type = types.attrs;
|
||||
example = { cudaSupport = true; };
|
||||
description = "nixpkgs config settings to be applied to all nixpkgs instances";
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
programs.java.enable = mkDefault (!generalCfg.minimal);
|
||||
|
||||
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) cfg.allowUnfreeList;
|
||||
aviallon.programs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) cfg.allowUnfreeList;
|
||||
|
||||
environment.systemPackages = with pkgs; []
|
||||
++ [
|
||||
|
|
@ -70,8 +76,6 @@ in
|
|||
newSession = true;
|
||||
};
|
||||
|
||||
aviallon.programs.allowUnfreeList = [];
|
||||
|
||||
programs.ccache.enable = true;
|
||||
|
||||
nix.settings.extra-sandbox-paths = [
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue