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

lightdm: Fix rendering

Browse Source
This commit is contained in:
William A. Kennington III 2015-03-10 14:03:12 -07:00
parent 59be6b06b4
commit 7b6e2e1c68
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
nixos/modules/services/x11/display-managers/lightdm.nix
View File

@ -26,19 +26,15 @@ let
buildInputs = [ pkgs.makeWrapper ]; buildInputs = [ pkgs.makeWrapper ];
buildCommand = '' buildCommand = ''
mkdir -p $out/gtk-3.0/ # This wrapper ensures that we actually get themes
# This wrapper ensures that we actually get ?? (fonts should be OK now)
makeWrapper ${pkgs.lightdm_gtk_greeter}/sbin/lightdm-gtk-greeter \ makeWrapper ${pkgs.lightdm_gtk_greeter}/sbin/lightdm-gtk-greeter \
$out/greeter \ $out/greeter \
--set XDG_DATA_DIRS ${pkgs.gnome2.gnome_icon_theme}/share \ --prefix PATH : "${pkgs.glibc}/bin" \
--set XDG_CONFIG_HOME $out/ --set GTK_DATA_PREFIX "${pkgs.gnome3.gnome_themes_standard}" \
--set GTK_EXE_PREFIX "${pkgs.gnome3.gnome_themes_standard}" \
# We need this to ensure that it actually tries to find icons from gnome-icon-theme --set GTK_PATH "${pkgs.gnome3.gnome_themes_standard}" \
cat - > $out/gtk-3.0/settings.ini << EOF --set XDG_DATA_DIRS "${pkgs.gnome3.gnome_themes_standard}/share:${pkgs.gnome3.gnome_icon_theme}/share" \
[Settings] --set XDG_CONFIG_HOME ${pkgs.gnome3.gnome_themes_standard}/share
gtk-icon-theme-name=gnome
EOF
cat - > $out/lightdm-gtk-greeter.desktop << EOF cat - > $out/lightdm-gtk-greeter.desktop << EOF
[Desktop Entry] [Desktop Entry]
@ -73,6 +69,13 @@ let
greeter-session = ${cfg.greeter.name} greeter-session = ${cfg.greeter.name}
''; '';
gtkGreeterConf = writeText "lightdm-gtk-greeter.conf"
''
[greeter]
theme-name = Adwaita
icon-theme-name = Adwaita
'';
in in
{ {
options = { options = {
@ -112,6 +115,7 @@ in
''; '';
}; };
environment.etc."lightdm/lightdm-gtk-greeter.conf".source = gtkGreeterConf;
environment.etc."lightdm/lightdm.conf".source = lightdmConf; environment.etc."lightdm/lightdm.conf".source = lightdmConf;
environment.etc."lightdm/users.conf".source = usersConf; environment.etc."lightdm/users.conf".source = usersConf;

2
pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix
View File

@ -6,8 +6,6 @@
#ToDo: bad icons with gtk2; #ToDo: bad icons with gtk2;
# avatar icon is missing in standard hicolor theme, I don't know where gtk3 takes it from # avatar icon is missing in standard hicolor theme, I don't know where gtk3 takes it from
#ToDo: Failed to open sessions directory: Error opening directory '${lightdm}/share/lightdm/remote-sessions': No such file or directory
let let
ver_branch = "2.0"; ver_branch = "2.0";
version = "2.0.0"; version = "2.0.0";