diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-28 16:14:15 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-28 22:45:56 +0100 |
| commit | d5047faedef254d01a21618224698c190bb67e5b (patch) | |
| tree | 42a43de15611b5e35b2888f02fb940365edb1402 /nixos/modules/services/audio/alsa.nix | |
| parent | f4a418761b481b15900c78b8086e7be58b0afe4e (diff) | |
| download | nixlib-d5047faedef254d01a21618224698c190bb67e5b.tar nixlib-d5047faedef254d01a21618224698c190bb67e5b.tar.gz nixlib-d5047faedef254d01a21618224698c190bb67e5b.tar.bz2 nixlib-d5047faedef254d01a21618224698c190bb67e5b.tar.lz nixlib-d5047faedef254d01a21618224698c190bb67e5b.tar.xz nixlib-d5047faedef254d01a21618224698c190bb67e5b.tar.zst nixlib-d5047faedef254d01a21618224698c190bb67e5b.zip | |
Remove uses of the "merge" option attribute
It's redundant because you can (and should) specify an option type, or an apply function.
Diffstat (limited to 'nixos/modules/services/audio/alsa.nix')
| -rw-r--r-- | nixos/modules/services/audio/alsa.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nixos/modules/services/audio/alsa.nix b/nixos/modules/services/audio/alsa.nix index 6c53ef46ab91..d021b8bd3ba9 100644 --- a/nixos/modules/services/audio/alsa.nix +++ b/nixos/modules/services/audio/alsa.nix @@ -20,14 +20,15 @@ in sound = { enable = mkOption { + type = types.bool; default = true; description = '' Whether to enable ALSA sound. ''; - merge = mergeEnableOption; }; enableOSSEmulation = mkOption { + type = types.bool; default = true; description = '' Whether to enable ALSA OSS emulation (with certain cards sound mixing may not work!). |