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

Use nss_myhostname from systemd

Browse Source
This commit is contained in:
Eelco Dolstra 2013-02-04 15:48:28 +01:00
parent 6199d4bb8e
commit 8ef4074811
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/config/nsswitch.nix
View File

@ -56,5 +56,5 @@ in
# Use nss-myhostname to ensure that our hostname always resolves to # Use nss-myhostname to ensure that our hostname always resolves to
# a valid IP address. It returns all locally configured IP # a valid IP address. It returns all locally configured IP
# addresses, or ::1 and 127.0.0.2 as fallbacks. # addresses, or ::1 and 127.0.0.2 as fallbacks.
system.nssModules = [ pkgs.nss_myhostname ]; system.nssModules = [ pkgs.systemd ];
} }

8
modules/services/x11/display-managers/default.nix
View File

@ -22,9 +22,7 @@ let
pathsToLink = "/lib/dri"; pathsToLink = "/lib/dri";
# To admit zero-length 'paths' # To admit zero-length 'paths'
postBuild = " postBuild = "mkdir -p $out/lib/dri";
mkdir -p $out/lib/dri
";
}; };
# file provided by services.xserver.displayManager.session.script # file provided by services.xserver.displayManager.session.script
@ -91,7 +89,7 @@ let
${xorg.xrdb}/bin/xrdb -merge ~/.Xdefaults ${xorg.xrdb}/bin/xrdb -merge ~/.Xdefaults
fi fi
export LIBVA_DRIVERS_PATH=${vaapiDrivers}/lib/dri; export LIBVA_DRIVERS_PATH=${vaapiDrivers}/lib/dri
source /etc/profile source /etc/profile
@ -139,7 +137,7 @@ let
mkDesktops = names: pkgs.runCommand "desktops" {} mkDesktops = names: pkgs.runCommand "desktops" {}
'' ''
ensureDir $out mkdir -p $out
${concatMapStrings (n: '' ${concatMapStrings (n: ''
cat - > "$out/${n}.desktop" << EODESKTOP cat - > "$out/${n}.desktop" << EODESKTOP
[Desktop Entry] [Desktop Entry]

4
modules/services/x11/xserver.nix
View File

@ -204,11 +204,11 @@ in
}; };
vaapiDrivers = mkOption { vaapiDrivers = mkOption {
default = [ pkgs.vaapiIntel pkgs.vaapiVdpau ]; default = [ ];
defaultText = "[ pkgs.vaapiIntel pkgs.vaapiVdpau ]"; defaultText = "[ pkgs.vaapiIntel pkgs.vaapiVdpau ]";
example = "[ pkgs.vaapiIntel pkgs.vaapiVdpau ]"; example = "[ pkgs.vaapiIntel pkgs.vaapiVdpau ]";
description = '' description = ''
Names of the packages providing libva acceleration drivers. Packages providing libva acceleration drivers.
''; '';
}; };