diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-10-12 17:27:57 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-10-12 17:27:57 +0000 |
| commit | d982f23f2052cca8e03cb21e3f0c7ff639d369d0 (patch) | |
| tree | 10cb3b88ae23d068d6975a031b1839eadee2a207 /modules/services/audio | |
| parent | 9943e0762e1589e37c3653c3812967f303225277 (diff) | |
| download | nixlib-d982f23f2052cca8e03cb21e3f0c7ff639d369d0.tar nixlib-d982f23f2052cca8e03cb21e3f0c7ff639d369d0.tar.gz nixlib-d982f23f2052cca8e03cb21e3f0c7ff639d369d0.tar.bz2 nixlib-d982f23f2052cca8e03cb21e3f0c7ff639d369d0.tar.lz nixlib-d982f23f2052cca8e03cb21e3f0c7ff639d369d0.tar.xz nixlib-d982f23f2052cca8e03cb21e3f0c7ff639d369d0.tar.zst nixlib-d982f23f2052cca8e03cb21e3f0c7ff639d369d0.zip | |
* Convert the remaining jobs to jobAttrs style.
svn path=/nixos/trunk/; revision=17764
Diffstat (limited to 'modules/services/audio')
| -rw-r--r-- | modules/services/audio/alsa.nix | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/modules/services/audio/alsa.nix b/modules/services/audio/alsa.nix index da92ed915b22..c72449150d19 100644 --- a/modules/services/audio/alsa.nix +++ b/modules/services/audio/alsa.nix @@ -1,8 +1,9 @@ # ALSA sound support. -{pkgs, config, ...}: +{ config, pkgs, ... }: + +with pkgs.lib; let - inherit (pkgs.lib) mkOption singleton mkIf; inherit (pkgs) alsaUtils; @@ -23,7 +24,7 @@ in description = '' Whether to enable ALSA sound. ''; - merge = pkgs.lib.mergeEnableOption; + merge = mergeEnableOption; }; }; @@ -44,10 +45,8 @@ in gid = config.ids.gids.audio; }; - jobs = singleton - { name = "alsa"; - - startOn = "udev"; + jobAttrs.alsa = + { startOn = "udev"; preStart = '' |