From 3cfcd937d34f42c006609439786c8e783dff08eb Mon Sep 17 00:00:00 2001 From: obadz Date: Fri, 16 Sep 2016 14:54:11 +0100 Subject: ligthdm: 1.18.1 -> 1.19.4 Required applying patch from https://bugs.gentoo.org/show_bug.cgi?id=588764 to lightdm_gtk_greeter --- .../applications/display-managers/lightdm-gtk-greeter/default.nix | 8 ++++++++ pkgs/applications/display-managers/lightdm/default.nix | 6 +++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix index ea80957afb02..235d4d16a405 100644 --- a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix @@ -18,6 +18,14 @@ stdenv.mkDerivation rec { sha256 = "031iv7zrpv27zsvahvfyrm75zdrh7591db56q89k8cjiiy600r1j"; }; + 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"; + }) + ]; + buildInputs = [ pkgconfig lightdm intltool makeWrapper ] ++ (if useGTK2 then [ gtk2 ] else [ gtk3 ]); diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index c33d06e7822a..e788585a0a96 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -5,15 +5,15 @@ }: let - ver_branch = "1.18"; - version = "1.18.1"; + ver_branch = "1.19"; + version = "1.19.4"; in stdenv.mkDerivation rec { name = "lightdm-${version}"; src = fetchurl { url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.xz"; - sha256 = "1yl9zhn9l83bj5mbifkxfw15nqgsjzzhqcrgb81fr290wijqaj45"; + sha256 = "1l105y07wkl9dj0cjhbs8qh6flpkyfj97wkw0rdd3n624lknvbqf"; }; patches = [ ./fix-paths.patch ]; -- cgit 1.4.1