From 9fdb7edae34839738b2c41ad086a0418cce5b943 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Fri, 31 Jul 2015 13:28:56 +0000 Subject: [PATCH] gdm 3.16: share some tests --- pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/default.nix b/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/default.nix index 83642f1afe6..51b67afb01f 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/default.nix @@ -3,23 +3,24 @@ , gtk, libcanberra_gtk3, pam, libtool, gobjectIntrospection }: stdenv.mkDerivation rec { - name = "gdm-${gnome3.version}.0"; + name = "gdm-${gnome3.version}.2"; src = fetchurl { url = "mirror://gnome/sources/gdm/${gnome3.version}/${name}.tar.xz"; - sha256 = "0qg2qxlfdvi1081r8bbid5hg7vqlpm91996ck2z7fq6kczy4hvdv"; + sha256 = "0mhv3q8z208qvhz00zrxlqn7w9gi5vy6w8dpjh5s2ka28l3yhbn3"; }; - # Only needed to make it build preConfigure = '' substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver}/bin/X" substituteInPlace daemon/gdm-simple-slave.c --replace 'BINDIR "/gnome-session' '"${gnome_session}/bin/gnome-session' substituteInPlace daemon/gdm-launch-environment.c --replace 'BINDIR "/dbus-launch' '"${dbus.tools}/bin/dbus-launch' substituteInPlace data/gdm.conf-custom.in --replace '#WaylandEnable=false' 'WaylandEnable=false' + sed 's/#Enable=true/Enable=true/' -i data/gdm.conf-custom.in ''; configureFlags = [ "--localstatedir=/var" "--with-systemd=yes" "--without-plymouth" - "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ]; + "--with-systemdsystemunitdir=$(out)/etc/systemd/system" + "--with-initial-vt=10" ]; buildInputs = [ pkgconfig glib itstool libxml2 intltool accountsservice gnome3.dconf systemd