summary refs log tree commit diff
diff options
context:
space:
mode:
authorLuca Bruno <lethalman88@gmail.com>2015-08-27 18:10:46 +0200
committerLuca Bruno <lethalman88@gmail.com>2015-08-27 18:11:39 +0200
commit52d7550da317001c4015e4b1edd1d359dabe7d91 (patch)
treec9c6f8e1ebe729d8b0b75ab7b9dcd764ea95f4f7
parent7043fa844cb6425c50de7ede9b3a37db8de7f92e (diff)
downloadnixpkgs-52d7550da317001c4015e4b1edd1d359dabe7d91.tar
nixpkgs-52d7550da317001c4015e4b1edd1d359dabe7d91.tar.gz
nixpkgs-52d7550da317001c4015e4b1edd1d359dabe7d91.tar.bz2
nixpkgs-52d7550da317001c4015e4b1edd1d359dabe7d91.tar.lz
nixpkgs-52d7550da317001c4015e4b1edd1d359dabe7d91.tar.xz
nixpkgs-52d7550da317001c4015e4b1edd1d359dabe7d91.tar.zst
nixpkgs-52d7550da317001c4015e4b1edd1d359dabe7d91.zip
gdm: point to /etc/gdm/custom.conf
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/gdm/default.nix9
1 files 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 d4ef3e13eea..d3d6f4e471c 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;