From c2ac422d402100380b0f985df19e60bfbe5c6355 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Fri, 5 Apr 2019 02:00:43 -0400
Subject: [PATCH] pantheon.elementary-greeter: correct substituteAll

---
 pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix | 2 +-
 pkgs/desktops/pantheon/desktop/elementary-greeter/gsd.patch   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
index 303aae6882b..140feb164b1 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
   patches = [
     (substituteAll {
       src = ./gsd.patch;
-      elementary-settings-daemon = "${elementary-settings-daemon}/libexec";
+      elementary_settings_daemon = "${elementary-settings-daemon}/libexec/";
     })
     (substituteAll {
       src = ./numlockx.patch;
diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/gsd.patch b/pkgs/desktops/pantheon/desktop/elementary-greeter/gsd.patch
index 1770d54aee0..bcbf604c6a2 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-greeter/gsd.patch
+++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/gsd.patch
@@ -7,7 +7,7 @@ index 2450c1a..a908d11 100644
  conf_data.set('CONF_DIR', join_paths(get_option('sysconfdir'), 'lightdm'))
  conf_data.set('GETTEXT_PACKAGE', meson.project_name())
 -conf_data.set('GSD_DIR', '/usr/lib/gnome-settings-daemon/')
-+conf_data.set('GSD_DIR', '@elementary-settings-daemon@')
++conf_data.set('GSD_DIR', '@elementary_settings_daemon@')
  conf_data.set('VERSION', meson.project_version())
  config_header = configure_file (
      input: 'config.vala.in',