diff --git a/modules/dream2nix/WIP-groups/default.nix b/modules/dream2nix/WIP-groups/default.nix index c57356ed..fe28ac49 100644 --- a/modules/dream2nix/WIP-groups/default.nix +++ b/modules/dream2nix/WIP-groups/default.nix @@ -5,5 +5,6 @@ }: { imports = [ ./interface.nix + ../overrides ]; } diff --git a/modules/dream2nix/WIP-groups/group.nix b/modules/dream2nix/WIP-groups/group.nix index b20fc4f9..3385f6f5 100644 --- a/modules/dream2nix/WIP-groups/group.nix +++ b/modules/dream2nix/WIP-groups/group.nix @@ -1,6 +1,6 @@ { overrideAll, - globalOverrides, + overrides, }: { config, dream2nix, @@ -12,13 +12,12 @@ packageType = name: t.deferredModuleWith { staticModules = [ - {_module.args = specialArgs;} # the top-level overrideAll overrideAll # the overrideAll of the current group config.overrideAll # the global overrides - (globalOverrides.${name} or {}) + (overrides.${name} or {}) # the overrides of the current group (config.overrides.${name} or {}) ]; diff --git a/modules/dream2nix/WIP-groups/interface.nix b/modules/dream2nix/WIP-groups/interface.nix index c14be654..02b23693 100644 --- a/modules/dream2nix/WIP-groups/interface.nix +++ b/modules/dream2nix/WIP-groups/interface.nix @@ -10,7 +10,7 @@ modules = [ (import ./group.nix { inherit (config) overrideAll; - globalOverrides = config.overrides; + overrides = config.overrides; }) ]; inherit specialArgs; @@ -24,33 +24,5 @@ in { Holds shared config (overrideAll) and overrides on a global and on a per group basis. ''; }; - overrideAll = lib.mkOption { - type = t.deferredModule; - description = '' - Common overrides for all packages. - Gets applied on all groups. - ''; - default = {}; - example = { - mkDerivation.doCheck = false; - }; - }; - overrides = lib.mkOption { - type = t.lazyAttrsOf (t.deferredModuleWith { - staticModules = [ - {_module.args = specialArgs;} - ]; - }); - description = '' - Overrides for specific package names. - Gets applied on all groups. - ''; - default = {}; - example = { - hello.postPatch = '' - substituteInPlace Makefile --replace /usr/local /usr - ''; - }; - }; }; }