lightdm-gtk-greeter: 1.6.1 -> 2.0.0

2 files changed, 19 insertions, 29 deletions

diff --git a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix
index 69f1eef9cecb..3ad367dc0586 100644
--- a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix
+++ b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix
@@ -9,32 +9,34 @@
 #ToDo: Failed to open sessions directory: Error opening directory '${lightdm}/share/lightdm/remote-sessions': No such file or directory
 
 let
-  ver_branch = "1.6";
-  version = "1.6.1";
+  ver_branch = "2.0";
+  version = "2.0.0";
 in
 stdenv.mkDerivation rec {
   name = "lightdm-gtk-greeter-${version}";
 
   src = fetchurl {
     url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.gz";
-    sha256 = "1nb8ljrbrp1zga083g3b633xi3izxxm4jipw1qgial1x16mqc0hz";
+    sha256 = "1134q8qd7gr34jkivqxckdnwbpa8pl7dhjpdi9fci0pcs4hh22jc";
   };
 
-  patches = [
-    ./lightdm-gtk-greeter.patch
-    (fetchurl { # CVE-2014-0979, https://bugs.launchpad.net/lightdm-gtk-greeter/+bug/1266449
-      url = "https://launchpadlibrarian.net/161796033/07_fix-NULL-username.patch";
-      sha256 = "1sqkhsz1z10k6vlmlrqrfx452lznv30885fmnzc73p2zxdlw9q1a";
-    })
-  ];
-  patchFlags = "-p1";
-
   buildInputs = [ pkgconfig lightdm intltool ]
     ++ (if useGTK2 then [ gtk2 makeWrapper ] else [ gtk3 ]);
 
-  configureFlags = stdenv.lib.optional useGTK2 "--with-gtk2";
+  configureFlags = [
+    "--localstatedir=/var"
+    "--sysconfdir=/etc"
+  ] ++ stdenv.lib.optional useGTK2 "--with-gtk2";
+
+  installFlags = [ "DESTDIR=\${out}" ];
 
   postInstall = ''
+      mv $out/$out/* $out
+      DIR=$out/$out
+      while rmdir $DIR 2>/dev/null; do
+        DIR="$(dirname "$DIR")"
+      done
+
       substituteInPlace "$out/share/xgreeters/lightdm-gtk-greeter.desktop" \
         --replace "Exec=lightdm-gtk-greeter" "Exec=$out/sbin/lightdm-gtk-greeter"
     '' + stdenv.lib.optionalString useGTK2 ''
@@ -42,9 +44,10 @@ stdenv.mkDerivation rec {
         --prefix XDG_DATA_DIRS ":" "${hicolor_icon_theme}/share"
     '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://launchpad.net/lightdm-gtk-greeter;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.ocharles ];
+    platforms = platforms.linux;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ ocharles wkennington ];
   };
 }
diff --git a/pkgs/applications/display-managers/lightdm-gtk-greeter/lightdm-gtk-greeter.patch b/pkgs/applications/display-managers/lightdm-gtk-greeter/lightdm-gtk-greeter.patch
deleted file mode 100644
index ea9e0eaec936..000000000000
--- a/pkgs/applications/display-managers/lightdm-gtk-greeter/lightdm-gtk-greeter.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/lightdm-gtk-greeter.c b/src/lightdm-gtk-greeter.c
-index cc5f9e1..d615dc1 100644
---- a/src/lightdm-gtk-greeter.c
-+++ b/src/lightdm-gtk-greeter.c
-@@ -1716,7 +1716,7 @@ main (int argc, char **argv)
-     gtk_container_add (GTK_CONTAINER (menuitem), image);
-     gtk_widget_show (GTK_WIDGET (menuitem));
-     
--    items = lightdm_get_sessions ();
-+    items = lightdm_get_sessions (greeter);
-     GSList *sessions = NULL;
-     for (item = items; item; item = item->next)
-     {