swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 12:29:02 +02:00
Code Issues 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 ];
buildCommand = ''
mkdir -p $out/gtk-3.0/
# This wrapper ensures that we actually get ?? (fonts should be OK now)
# This wrapper ensures that we actually get themes
makeWrapper ${pkgs.lightdm_gtk_greeter}/sbin/lightdm-gtk-greeter \
$out/greeter \
--set XDG_DATA_DIRS ${pkgs.gnome2.gnome_icon_theme}/share \
--set XDG_CONFIG_HOME $out/
# We need this to ensure that it actually tries to find icons from gnome-icon-theme
cat - > $out/gtk-3.0/settings.ini << EOF
[Settings]
gtk-icon-theme-name=gnome
EOF
--prefix PATH : "${pkgs.glibc}/bin" \
--set GTK_DATA_PREFIX "${pkgs.gnome3.gnome_themes_standard}" \
--set GTK_EXE_PREFIX "${pkgs.gnome3.gnome_themes_standard}" \
--set GTK_PATH "${pkgs.gnome3.gnome_themes_standard}" \
--set XDG_DATA_DIRS "${pkgs.gnome3.gnome_themes_standard}/share:${pkgs.gnome3.gnome_icon_theme}/share" \
--set XDG_CONFIG_HOME ${pkgs.gnome3.gnome_themes_standard}/share
cat - > $out/lightdm-gtk-greeter.desktop << EOF
[Desktop Entry]
@ -73,6 +69,13 @@ let
greeter-session = ${cfg.greeter.name}
'';
gtkGreeterConf = writeText "lightdm-gtk-greeter.conf"
''
[greeter]
theme-name = Adwaita
icon-theme-name = Adwaita
'';
in
{
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/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;
# 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
ver_branch = "2.0";
version = "2.0.0";