diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-02-04 15:48:28 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-02-04 15:50:37 +0100 |
| commit | 8ef4074811d419bf81513608d07c67955a1d9d0b (patch) | |
| tree | 6e841fad9a2c6657a639f6a2224d2b6ec255614c /modules/services/x11 | |
| parent | 6199d4bb8e51af6b75f1e38194d0349be6df0ff4 (diff) | |
| download | nixlib-8ef4074811d419bf81513608d07c67955a1d9d0b.tar nixlib-8ef4074811d419bf81513608d07c67955a1d9d0b.tar.gz nixlib-8ef4074811d419bf81513608d07c67955a1d9d0b.tar.bz2 nixlib-8ef4074811d419bf81513608d07c67955a1d9d0b.tar.lz nixlib-8ef4074811d419bf81513608d07c67955a1d9d0b.tar.xz nixlib-8ef4074811d419bf81513608d07c67955a1d9d0b.tar.zst nixlib-8ef4074811d419bf81513608d07c67955a1d9d0b.zip | |
Use nss_myhostname from systemd
Diffstat (limited to 'modules/services/x11')
| -rw-r--r-- | modules/services/x11/display-managers/default.nix | 8 | ||||
| -rw-r--r-- | modules/services/x11/xserver.nix | 4 |
2 files changed, 5 insertions, 7 deletions
diff --git a/modules/services/x11/display-managers/default.nix b/modules/services/x11/display-managers/default.nix index cf4bbedfa272..cfe21c2a500e 100644 --- a/modules/services/x11/display-managers/default.nix +++ b/modules/services/x11/display-managers/default.nix @@ -22,9 +22,7 @@ let pathsToLink = "/lib/dri"; # To admit zero-length 'paths' - postBuild = " - mkdir -p $out/lib/dri - "; + postBuild = "mkdir -p $out/lib/dri"; }; # file provided by services.xserver.displayManager.session.script @@ -91,7 +89,7 @@ let ${xorg.xrdb}/bin/xrdb -merge ~/.Xdefaults fi - export LIBVA_DRIVERS_PATH=${vaapiDrivers}/lib/dri; + export LIBVA_DRIVERS_PATH=${vaapiDrivers}/lib/dri source /etc/profile @@ -139,7 +137,7 @@ let mkDesktops = names: pkgs.runCommand "desktops" {} '' - ensureDir $out + mkdir -p $out ${concatMapStrings (n: '' cat - > "$out/${n}.desktop" << EODESKTOP [Desktop Entry] diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix index c93c443287b1..7cc507feb1d5 100644 --- a/modules/services/x11/xserver.nix +++ b/modules/services/x11/xserver.nix @@ -204,11 +204,11 @@ in }; vaapiDrivers = mkOption { - default = [ pkgs.vaapiIntel pkgs.vaapiVdpau ]; + default = [ ]; defaultText = "[ pkgs.vaapiIntel pkgs.vaapiVdpau ]"; example = "[ pkgs.vaapiIntel pkgs.vaapiVdpau ]"; description = '' - Names of the packages providing libva acceleration drivers. + Packages providing libva acceleration drivers. ''; }; |