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

udev module: filter duplicate udev paths

Browse Source 
Fixes #24174
This commit is contained in:
Nikolay Amiantov 2017-03-21 19:41:25 +03:00
parent d3e2957c90
commit 6555ec03c3
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/modules/services/hardware/udev.nix
View File

@ -35,6 +35,7 @@ let
udevRules = pkgs.runCommand "udev-rules" udevRules = pkgs.runCommand "udev-rules"
{ preferLocalBuild = true; { preferLocalBuild = true;
allowSubstitutes = false; allowSubstitutes = false;
packages = unique (map toString cfg.packages);
} }
'' ''
mkdir -p $out mkdir -p $out
@ -45,7 +46,7 @@ let
echo 'ENV{PATH}="${udevPath}/bin:${udevPath}/sbin"' > $out/00-path.rules echo 'ENV{PATH}="${udevPath}/bin:${udevPath}/sbin"' > $out/00-path.rules
# Add the udev rules from other packages. # Add the udev rules from other packages.
for i in ${toString cfg.packages}; do for i in $packages; do
echo "Adding rules for package $i" echo "Adding rules for package $i"
for j in $i/{etc,lib}/udev/rules.d/*; do for j in $i/{etc,lib}/udev/rules.d/*; do
echo "Copying $j to $out/$(basename $j)" echo "Copying $j to $out/$(basename $j)"
@ -132,10 +133,11 @@ let
hwdbBin = pkgs.runCommand "hwdb.bin" hwdbBin = pkgs.runCommand "hwdb.bin"
{ preferLocalBuild = true; { preferLocalBuild = true;
allowSubstitutes = false; allowSubstitutes = false;
packages = unique (map toString ([udev] ++ cfg.packages));
} }
'' ''
mkdir -p etc/udev/hwdb.d mkdir -p etc/udev/hwdb.d
for i in ${toString ([udev] ++ cfg.packages)}; do for i in $packages; do
echo "Adding hwdb files for package $i" echo "Adding hwdb files for package $i"
for j in $i/{etc,lib}/udev/hwdb.d/*; do for j in $i/{etc,lib}/udev/hwdb.d/*; do
ln -s $j etc/udev/hwdb.d/$(basename $j) ln -s $j etc/udev/hwdb.d/$(basename $j)