ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-17 10:37:45 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #299805 from ncfavier/xorg-module-order

Browse Source 
nixos/xserver: respect module order
This commit is contained in:
K900 2024-03-29 12:47:38 +03:00 committed by GitHub
commit 3c9e0924c4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nixos/modules/services/x11/xserver.nix
View File

@ -111,7 +111,7 @@ let
} }
'' ''
echo 'Section "Files"' >> $out echo 'Section "Files"' >> $out
echo $fontpath >> $out echo "$fontpath" >> $out
for i in ${toString fontsForXServer}; do for i in ${toString fontsForXServer}; do
if test "''${i:0:''${#NIX_STORE}}" == "$NIX_STORE"; then if test "''${i:0:''${#NIX_STORE}}" == "$NIX_STORE"; then
@ -121,11 +121,9 @@ let
fi fi
done done
for i in $(find ${toString cfg.modules} -type d | sort); do ${concatMapStrings (m: ''
if test $(echo $i/*.so* | wc -w) -ne 0; then echo " ModulePath \"${m}/lib/xorg/modules\"" >> "$out"
echo " ModulePath \"$i\"" >> $out '') cfg.modules}
fi
done
echo '${cfg.filesSection}' >> $out echo '${cfg.filesSection}' >> $out
echo 'EndSection' >> $out echo 'EndSection' >> $out