public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added choice of sound devices mode.

Browse Source 
svn path=/nixos/trunk/; revision=10045
This commit is contained in:
Michael Raskin 2008-01-02 10:07:52 +00:00
parent 0b4ee455d9
commit 27d5e93920
4 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
system/options.nix
View File

@ -1162,7 +1162,16 @@
and cannot be redistributed. and cannot be redistributed.
"; ";
}; };
sndMode = mkOption {
default = "0600";
example = "0666";
description = "
Permissions for /dev/snd/*, in case you have multiple
logged in users or if the devices belong to root for
some reason.
";
};
}; };

1
upstart-jobs/default.nix
View File

@ -30,6 +30,7 @@ let
(config.services.udev.addFirmware); (config.services.udev.addFirmware);
extraUdevPkgs = extraUdevPkgs =
pkgs.lib.optional (config.services.hal.enable) pkgs.hal; pkgs.lib.optional (config.services.hal.enable) pkgs.hal;
sndMode = config.services.udev.sndMode;
}) })
# Makes LVM logical volumes available. # Makes LVM logical volumes available.

12
upstart-jobs/udev-rules/50-udev.rules
View File

@ -34,12 +34,12 @@ KERNEL=="sr[0-9]", BUS=="scsi", SYMLINK+="cdrom cdrom-%k"
# ALSA sound devices. # ALSA sound devices.
KERNEL=="controlC[0-9]*", NAME="snd/%k" KERNEL=="controlC[0-9]*", NAME="snd/%k", MODE="@sndMode@"
KERNEL=="hwC[D0-9]*", NAME="snd/%k" KERNEL=="hwC[D0-9]*", NAME="snd/%k", MODE="@sndMode@"
KERNEL=="pcmC[D0-9cp]*", NAME="snd/%k" KERNEL=="pcmC[D0-9cp]*", NAME="snd/%k", MODE="@sndMode@"
KERNEL=="midiC[D0-9]*", NAME="snd/%k" KERNEL=="midiC[D0-9]*", NAME="snd/%k", MODE="@sndMode@"
KERNEL=="timer", NAME="snd/%k" KERNEL=="timer", NAME="snd/%k", MODE="@sndMode@"
KERNEL=="seq", NAME="snd/%k" KERNEL=="seq", NAME="snd/%k", MODE="@sndMode@"
# Firmware loading. # Firmware loading.

2
upstart-jobs/udev.nix
View File

@ -1,5 +1,6 @@
{ stdenv, writeText, substituteAll, cleanSource, udev, procps, firmwareDirs { stdenv, writeText, substituteAll, cleanSource, udev, procps, firmwareDirs
, extraUdevPkgs ? [] , extraUdevPkgs ? []
, sndMode ? "0600"
}: }:
let let
@ -14,6 +15,7 @@ let
isExecutable = true; isExecutable = true;
inherit firmwareDirs; inherit firmwareDirs;
}; };
inherit sndMode;
buildCommand = " buildCommand = "
buildCommand= # urgh buildCommand= # urgh
ensureDir $out ensureDir $out