From 52d7550da317001c4015e4b1edd1d359dabe7d91 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Thu, 27 Aug 2015 18:10:46 +0200 Subject: [PATCH] gdm: point to /etc/gdm/custom.conf --- pkgs/desktops/gnome-3/3.16/core/gdm/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.16/core/gdm/default.nix b/pkgs/desktops/gnome-3/3.16/core/gdm/default.nix index d4ef3e13eea9..d3d6f4e471c4 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gdm/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gdm/default.nix @@ -15,7 +15,9 @@ stdenv.mkDerivation rec { substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver}/bin/X" ''; - configureFlags = [ "--localstatedir=/var" "--with-systemd=yes" + configureFlags = [ "--sysconfdir=/etc" + "--localstatedir=/var" + "--with-systemd=yes" "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ]; buildInputs = [ pkgconfig glib itstool libxml2 intltool @@ -30,7 +32,10 @@ stdenv.mkDerivation rec { ''; # Disable Access Control because our X does not support FamilyServerInterpreted yet - patches = [ ./xserver_path.patch ./sessions_dir.patch ./disable_x_access_control.patch ./no-dbus-launch.patch ]; + patches = [ ./xserver_path.patch ./sessions_dir.patch + ./disable_x_access_control.patch ./no-dbus-launch.patch ]; + + installFlags = [ "sysconfdir=$(out)/etc" "dbusconfdir=$(out)/etc/dbus-1/system.d" ]; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Projects/GDM;