diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-12-10 19:00:06 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-12-10 19:01:27 +0100 |
| commit | f3618342ece994482697892133532a380a04cd0f (patch) | |
| tree | bd6067d893770d9f7d272aaa5c5968ff517769d0 /nixos/modules/services/printing/cupsd.nix | |
| parent | 5e7e4c93a9a93c12d5eaa3a91e289d18195aaa75 (diff) | |
| parent | 2ff8cef0a4c969b9c377db4e0fe6eb8f5404e0b4 (diff) | |
| download | nixpkgs-f3618342ece994482697892133532a380a04cd0f.tar nixpkgs-f3618342ece994482697892133532a380a04cd0f.tar.gz nixpkgs-f3618342ece994482697892133532a380a04cd0f.tar.bz2 nixpkgs-f3618342ece994482697892133532a380a04cd0f.tar.lz nixpkgs-f3618342ece994482697892133532a380a04cd0f.tar.xz nixpkgs-f3618342ece994482697892133532a380a04cd0f.tar.zst nixpkgs-f3618342ece994482697892133532a380a04cd0f.zip | |
Merge staging-next into staging
Diffstat (limited to 'nixos/modules/services/printing/cupsd.nix')
| -rw-r--r-- | nixos/modules/services/printing/cupsd.nix | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix index 1071c05d514..cc35be49bc3 100644 --- a/nixos/modules/services/printing/cupsd.nix +++ b/nixos/modules/services/printing/cupsd.nix @@ -112,6 +112,15 @@ in { + imports = [ + (mkChangedOptionModule [ "services" "printing" "gutenprint" ] [ "services" "printing" "drivers" ] + (config: + let enabled = getAttrFromPath [ "services" "printing" "gutenprint" ] config; + in if enabled then [ pkgs.gutenprint ] else [ ])) + (mkRemovedOptionModule [ "services" "printing" "cupsFilesConf" ] "") + (mkRemovedOptionModule [ "services" "printing" "cupsdConf" ] "") + ]; + ###### interface options = { |