lightdm-gtk-greeter: 2.0.1 -> 2.0.3

NixOS · Dec 17, 2017 · 32a00e9 · 32a00e9 · vcunat · Dec 25, 2017
1 parent 66d7547
commit 32a00e9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix
@@ -1,33 +1,26 @@
 { stdenv, fetchurl, lightdm, pkgconfig, intltool
 , hicolor_icon_theme, makeWrapper
 , useGTK2 ? false, gtk2, gtk3 # gtk3 seems better supported
+, exo
 }:
 
 #ToDo: bad icons with gtk2;
 #  avatar icon is missing in standard hicolor theme, I don't know where gtk3 takes it from
 
 let
   ver_branch = "2.0";
-  version = "2.0.1";
+  version = "2.0.3";
 in
 stdenv.mkDerivation rec {
   name = "lightdm-gtk-greeter-${version}";
 
   src = fetchurl {
     url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.gz";
-    sha256 = "031iv7zrpv27zsvahvfyrm75zdrh7591db56q89k8cjiiy600r1j";
+    sha256 = "0c6v2myzqj8nzpcqyvbab7c66kwgcshw2chn5r6dhm7xrx19bcrx";
   };
 
-  patches = [
-    (fetchurl {
-      name = "lightdm-gtk-greeter-2.0.1-lightdm-1.19.patch";
-      url = "https://588764.bugs.gentoo.org/attachment.cgi?id=442616";
-      sha256 = "0r383kjkvq9yanjc1lk878xc5g8993pjgxylqhhjb5rkpi1mbfsv";
-    })
-  ];
-
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ lightdm intltool makeWrapper ]
+  buildInputs = [ lightdm exo intltool makeWrapper ]
     ++ (if useGTK2 then [ gtk2 ] else [ gtk3 ]);
 
   configureFlags = [

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -16777,7 +16777,9 @@ with pkgs;
 
   lightdm_qt = lightdm.override { withQt5 = true; };
 
-  lightdm_gtk_greeter = callPackage ../applications/display-managers/lightdm-gtk-greeter { };
+  lightdm_gtk_greeter = callPackage ../applications/display-managers/lightdm-gtk-greeter {
+    inherit (xfce) exo;
+  };
 
   slic3r = callPackage ../applications/misc/slic3r { };