diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-04-13 09:25:28 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-04-13 09:25:28 +0200 |
| commit | 39ebb01d6e8d19b042fe65d303234d0db27877eb (patch) | |
| tree | 083025f5791bfce9f14e1d3f4c66035ef82ba72d /nixos/modules/services/x11/xserver.nix | |
| parent | 81cedab4f1fe9578e004ce03de5630a25c737a9e (diff) | |
| parent | 87b49397bf1e26ac17c4a55fed41bd836fefc39d (diff) | |
| download | nixlib-39ebb01d6e8d19b042fe65d303234d0db27877eb.tar nixlib-39ebb01d6e8d19b042fe65d303234d0db27877eb.tar.gz nixlib-39ebb01d6e8d19b042fe65d303234d0db27877eb.tar.bz2 nixlib-39ebb01d6e8d19b042fe65d303234d0db27877eb.tar.lz nixlib-39ebb01d6e8d19b042fe65d303234d0db27877eb.tar.xz nixlib-39ebb01d6e8d19b042fe65d303234d0db27877eb.tar.zst nixlib-39ebb01d6e8d19b042fe65d303234d0db27877eb.zip | |
Merge branch 'staging', containing closure-size #7701
Diffstat (limited to 'nixos/modules/services/x11/xserver.nix')
| -rw-r--r-- | nixos/modules/services/x11/xserver.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index ff44963c94fa..dcf9f820f59c 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -456,7 +456,7 @@ in ]); environment.systemPackages = - [ xorg.xorgserver + [ xorg.xorgserver.out xorg.xrandr xorg.xrdb xorg.setxkbmap @@ -494,7 +494,7 @@ in XKB_BINDIR = "${xorg.xkbcomp}/bin"; # Needed for the Xkb extension. XORG_DRI_DRIVER_PATH = "/run/opengl-driver/lib/dri"; # !!! Depends on the driver selected at runtime. LD_LIBRARY_PATH = concatStringsSep ":" ( - [ "${xorg.libX11}/lib" "${xorg.libXext}/lib" ] + [ "${xorg.libX11.out}/lib" "${xorg.libXext.out}/lib" ] ++ concatLists (catAttrs "libPath" cfg.drivers)); } // cfg.displayManager.job.environment; @@ -525,7 +525,7 @@ in services.xserver.modules = concatLists (catAttrs "modules" cfg.drivers) ++ - [ xorg.xorgserver + [ xorg.xorgserver.out xorg.xf86inputevdev ]; |