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

lightdm-gtk-greeter: Update to 1.6.1

Browse Source
This commit is contained in:
Oliver Charles 2014-01-31 12:53:07 +00:00
parent cdac4b69c9
commit d56bd75967
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,18 +10,18 @@
let let
ver_branch = "1.6"; ver_branch = "1.6";
version = "1.5.1"; # 1.5.2 and 1.6.0 result into infinite cycling of X in restarts version = "1.6.1";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "lightdm-gtk-greeter-${version}"; name = "lightdm-gtk-greeter-${version}";
src = fetchurl { src = fetchurl {
url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.gz"; url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.gz";
sha256 = "08fnsbnay5jhd7ps8n91i6c227zq6xizpyn34qhqzykrga8pxkpc"; sha256 = "1nb8ljrbrp1zga083g3b633xi3izxxm4jipw1qgial1x16mqc0hz";
}; };
patches = [ ./lightdm-gtk-greeter.patch ]; patches = [ ./lightdm-gtk-greeter.patch ];
patchFlags = "-p0"; patchFlags = "-p1";
buildInputs = [ pkgconfig lightdm intltool ] buildInputs = [ pkgconfig lightdm intltool ]
++ (if useGTK2 then [ gtk2 makeWrapper ] else [ gtk3 ]); ++ (if useGTK2 then [ gtk2 makeWrapper ] else [ gtk3 ]);
@ -39,5 +39,6 @@ stdenv.mkDerivation rec {
meta = { meta = {
homepage = http://launchpad.net/lightdm-gtk-greeter; homepage = http://launchpad.net/lightdm-gtk-greeter;
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.ocharles ];
}; };
} }

18
pkgs/applications/display-managers/lightdm-gtk-greeter/lightdm-gtk-greeter.patch
View File

@ -1,13 +1,13 @@
=== modified file 'src/lightdm-gtk-greeter.c' diff --git a/src/lightdm-gtk-greeter.c b/src/lightdm-gtk-greeter.c
--- src/lightdm-gtk-greeter.c 2013-02-09 23:20:39 +0000 index cc5f9e1..d615dc1 100644
+++ src/lightdm-gtk-greeter.c 2013-03-29 12:21:34 +0000 --- a/src/lightdm-gtk-greeter.c
@@ -1273,7 +1273,7 @@ +++ b/src/lightdm-gtk-greeter.c
gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (session_combo), renderer, TRUE); @@ -1716,7 +1716,7 @@ main (int argc, char **argv)
gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (session_combo), renderer, "text", 0); gtk_container_add (GTK_CONTAINER (menuitem), image);
model = gtk_combo_box_get_model (session_combo); gtk_widget_show (GTK_WIDGET (menuitem));
- items = lightdm_get_sessions (); - items = lightdm_get_sessions ();
+ items = lightdm_get_sessions (greeter); + items = lightdm_get_sessions (greeter);
GSList *sessions = NULL;
for (item = items; item; item = item->next) for (item = items; item; item = item->next)
{ {
LightDMSession *session = item->data;