gdm 3.16: share some tests

This commit is contained in:
Luca Bruno 2015-07-31 13:28:56 +00:00
parent 5945655fd6
commit 9fdb7edae3

View File

@ -3,23 +3,24 @@
, gtk, libcanberra_gtk3, pam, libtool, gobjectIntrospection }: , gtk, libcanberra_gtk3, pam, libtool, gobjectIntrospection }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gdm-${gnome3.version}.0"; name = "gdm-${gnome3.version}.2";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/gdm/${gnome3.version}/${name}.tar.xz"; url = "mirror://gnome/sources/gdm/${gnome3.version}/${name}.tar.xz";
sha256 = "0qg2qxlfdvi1081r8bbid5hg7vqlpm91996ck2z7fq6kczy4hvdv"; sha256 = "0mhv3q8z208qvhz00zrxlqn7w9gi5vy6w8dpjh5s2ka28l3yhbn3";
}; };
# Only needed to make it build
preConfigure = '' preConfigure = ''
substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver}/bin/X" 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-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 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' 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" 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 buildInputs = [ pkgconfig glib itstool libxml2 intltool
accountsservice gnome3.dconf systemd accountsservice gnome3.dconf systemd