diff options
author | Someone Serge <sergei.kozlukov@aalto.fi> | 2023-11-21 16:03:58 +0000 |
---|---|---|
committer | Someone Serge <sergei.kozlukov@aalto.fi> | 2024-06-26 00:35:44 +0000 |
commit | 927b15ed6db1e7da9f35e0f4a3ae85293cac5454 (patch) | |
tree | 397a9a49d746996ead919fc5da4ef7a8862e37b5 /nixos | |
parent | 6a6b6ac3590abc8020d4fbb332296703551ea867 (diff) |
nixos/nix-required-mounts: allow passing extra arguments to the hook
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/programs/nix-required-mounts.nix | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/nixos/modules/programs/nix-required-mounts.nix b/nixos/modules/programs/nix-required-mounts.nix index b3c11a51f6fc6..98ab819af55e8 100644 --- a/nixos/modules/programs/nix-required-mounts.nix +++ b/nixos/modules/programs/nix-required-mounts.nix @@ -3,9 +3,6 @@ let cfg = config.programs.nix-required-mounts; package = pkgs.nix-required-mounts; - overridenPackage = package.override { - inherit (cfg) allowedPatterns; - }; Mount = with lib; types.submodule { @@ -86,9 +83,26 @@ in example.require-ipfs.paths = [ "/ipfs" ]; example.require-ipfs.onFeatures = [ "ifps" ]; }; + extraWrapperArgs = lib.mkOption { + type = with lib.types; listOf str; + default = [ ]; + description = + lib.mdDoc + "List of extra arguments (such as `--add-flags -v`) to pass to the hook's wrapper"; + }; + package = lib.mkOption { + type = lib.types.package; + default = package.override { + inherit (cfg) + allowedPatterns + extraWrapperArgs; + }; + description = lib.mdDoc "The final package with the final config applied"; + internal = true; + }; }; config = lib.mkIf cfg.enable (lib.mkMerge [ - { nix.settings.pre-build-hook = lib.getExe overridenPackage; } + { nix.settings.pre-build-hook = lib.getExe cfg.package; } (lib.mkIf cfg.presets.nvidia-gpu.enable { nix.settings.system-features = cfg.allowedPatterns.nvidia-gpu.onFeatures; programs.nix-required-mounts.allowedPatterns = { |