lightdm: 1.18.1 -> 1.22.0 (#24545)

Remove patch

2 files changed, 11 insertions, 71 deletions

diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix
index b3dd9f91ec89..191ec84f87bf 100644
--- a/pkgs/applications/display-managers/lightdm/default.nix
+++ b/pkgs/applications/display-managers/lightdm/default.nix
@@ -4,38 +4,39 @@
 , withQt5 ? false, qtbase
 }:
 
+with stdenv.lib;
+
 let
-  ver_branch = "1.19";
-  version = "1.19.5";
+  ver_branch = "1.22";
+  version = "1.22.0";
 in
 stdenv.mkDerivation rec {
   name = "lightdm-${version}";
 
   src = fetchurl {
     url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.xz";
-    sha256 = "0gbz8jk1ljh8rwgvldkiqma1k61sd27yh008228ahdqd5i2v1r1z";
+    sha256 = "0a5bvfl2h7r873al6q7c819h0kg564k9fh51rl6489z6lyvazfg4";
   };
 
-  patches = [ ./fix-paths.patch ];
-
+  nativeBuildInputs = [ pkgconfig intltool ];
   buildInputs = [
-    pkgconfig pam libxcb glib libXdmcp itstool libxml2 intltool libxklavier libgcrypt
+    pam libxcb glib libXdmcp itstool libxml2 libxklavier libgcrypt
     qt4 libaudit gcc6
-  ] ++ stdenv.lib.optional withQt5 qtbase;
+  ] ++ optional withQt5 qtbase;
 
   configureFlags = [
     "--localstatedir=/var"
     "--sysconfdir=/etc"
     "--disable-tests"
-  ] ++ stdenv.lib.optional (qt4 != null) "--enable-liblightdm-qt"
-    ++ stdenv.lib.optional withQt5 "--enable-liblightdm-qt5";
+  ] ++ optional (qt4 != null) "--enable-liblightdm-qt"
+    ++ optional withQt5 "--enable-liblightdm-qt5";
 
   installFlags = [
     "sysconfdir=\${out}/etc"
     "localstatedir=\${TMPDIR}"
   ];
 
-  meta = with stdenv.lib; {
+  meta = {
     homepage = https://launchpad.net/lightdm;
     platforms = platforms.linux;
     license = licenses.gpl3;
diff --git a/pkgs/applications/display-managers/lightdm/fix-paths.patch b/pkgs/applications/display-managers/lightdm/fix-paths.patch
deleted file mode 100644
index 56930418caca..000000000000
--- a/pkgs/applications/display-managers/lightdm/fix-paths.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff --git a/common/user-list.c b/common/user-list.c
-index 792c6d3..57fbfb7 100644
---- a/common/user-list.c
-+++ b/common/user-list.c
-@@ -331,7 +331,7 @@ load_passwd_file (CommonUserList *user_list, gboolean emit_add_signal)
- 
-     value = g_key_file_get_string (config, "UserList", "hidden-shells", NULL);
-     if (!value)
--        value = g_strdup ("/bin/false /usr/sbin/nologin");
-+        value = g_strdup ("/run/current-system/sw/bin/nologin");
-     hidden_shells = g_strsplit (value, " ", -1);
-     g_free (value);
- 
-diff --git a/src/seat.c b/src/seat.c
-index f9b149d..9029742 100644
---- a/src/seat.c
-+++ b/src/seat.c
-@@ -343,7 +343,7 @@ run_script (Seat *seat, DisplayServer *display_server, const gchar *script_name,
- 
-     /* Set POSIX variables */
-     process_set_clear_environment (script, TRUE);
--    process_set_env (script, "SHELL", "/bin/sh");
-+    process_set_env (script, "SHELL", "/run/current-system/sw/bin/sh");
- 
-     /* Variables required for regression tests */
-     if (g_getenv ("LIGHTDM_TEST_ROOT"))
-@@ -354,7 +354,7 @@ run_script (Seat *seat, DisplayServer *display_server, const gchar *script_name,
-         process_set_env (script, "PATH", g_getenv ("PATH"));
-     }
-     else
--        process_set_env (script, "PATH", "/usr/local/bin:/usr/bin:/bin");
-+        process_set_env (script, "PATH", "/run/current-system/sw/bin");
- 
-     if (user)
-     {
-diff --git a/src/session-child.c b/src/session-child.c
-index e85f57d..93db0bd 100644
---- a/src/session-child.c
-+++ b/src/session-child.c
-@@ -410,7 +410,7 @@ session_child_run (int argc, char **argv)
-         else
-         {
-             /* Set POSIX variables */
--            pam_putenv (pam_handle, "PATH=/usr/local/bin:/usr/bin:/bin");
-+            pam_putenv (pam_handle, "PATH=/run/current-system/sw/bin");
-             pam_putenv (pam_handle, g_strdup_printf ("USER=%s", username));
-             pam_putenv (pam_handle, g_strdup_printf ("LOGNAME=%s", username));
-             pam_putenv (pam_handle, g_strdup_printf ("HOME=%s", user_get_home_directory (user)));
-diff --git a/src/shared-data-manager.c b/src/shared-data-manager.c
-index 47f1c10..cc82652 100644
---- a/src/shared-data-manager.c
-+++ b/src/shared-data-manager.c
-@@ -68,7 +68,7 @@ delete_unused_user (gpointer key, gpointer value, gpointer user_data)
- 
-     gchar *path = g_build_filename (USERS_DIR, user, NULL);
-     gchar *quoted_path = g_shell_quote (path);
--    gchar *cmd = g_strdup_printf ("/bin/rm -rf %s", quoted_path);
-+    gchar *cmd = g_strdup_printf ("/run/current-system/sw/bin/rm -rf %s", quoted_path);
- 
-     g_spawn_command_line_async (cmd, &error);
-     if (error)