pyrox.dev
gdm: fix build with systemd 230
+4
-3
pkgs/desktops/gnome-3/3.18/core/gdm/default.nix
+4
-3
pkgs/desktops/gnome-3/3.18/core/gdm/default.nix
···
1
{ stdenv, fetchurl, pkgconfig, glib, itstool, libxml2, xorg, dbus
2
-
, intltool, accountsservice, libX11, gnome3, systemd, gnome_session
3
, gtk, libcanberra_gtk3, pam, libtool, gobjectIntrospection }:
4
5
stdenv.mkDerivation rec {
···
15
"--with-systemd=yes"
16
"--with-systemdsystemunitdir=$(out)/etc/systemd/system" ];
17
18
-
buildInputs = [ pkgconfig glib itstool libxml2 intltool
19
accountsservice gnome3.dconf systemd
20
gobjectIntrospection libX11 gtk
21
libcanberra_gtk3 pam libtool ];
···
28
29
# Disable Access Control because our X does not support FamilyServerInterpreted yet
30
patches = [ ./xserver_path.patch ./sessions_dir.patch
31
-
./disable_x_access_control.patch ./no-dbus-launch.patch ];
32
33
installFlags = [ "sysconfdir=$(out)/etc" "dbusconfdir=$(out)/etc/dbus-1/system.d" ];
34
···
1
{ stdenv, fetchurl, pkgconfig, glib, itstool, libxml2, xorg, dbus
2
+
, intltool, accountsservice, libX11, gnome3, systemd, gnome_session, autoreconfHook
3
, gtk, libcanberra_gtk3, pam, libtool, gobjectIntrospection }:
4
5
stdenv.mkDerivation rec {
···
15
"--with-systemd=yes"
16
"--with-systemdsystemunitdir=$(out)/etc/systemd/system" ];
17
18
+
buildInputs = [ pkgconfig glib itstool libxml2 intltool autoreconfHook
19
accountsservice gnome3.dconf systemd
20
gobjectIntrospection libX11 gtk
21
libcanberra_gtk3 pam libtool ];
···
28
29
# Disable Access Control because our X does not support FamilyServerInterpreted yet
30
patches = [ ./xserver_path.patch ./sessions_dir.patch
31
+
./disable_x_access_control.patch ./no-dbus-launch.patch
32
+
./libsystemd.patch ];
33
34
installFlags = [ "sysconfdir=$(out)/etc" "dbusconfdir=$(out)/etc/dbus-1/system.d" ];
35
+21
pkgs/desktops/gnome-3/3.18/core/gdm/libsystemd.patch
+21
pkgs/desktops/gnome-3/3.18/core/gdm/libsystemd.patch
···
···
1
+
https://github.com/GNOME/gdm/commit/eee5bf72c9bb1c1d62eb0e7102088ae3b9a188cd
2
+
--- a/configure.ac 2016-05-27 11:10:44.589740789 +0200
3
+
+++ b/configure.ac 2016-05-27 11:11:00.146427723 +0200
4
+
@@ -888,7 +888,7 @@
5
+
dnl ---------------------------------------------------------------------------
6
+
7
+
PKG_CHECK_MODULES(SYSTEMD,
8
+
- [libsystemd-login >= 186 libsystemd-daemon],
9
+
+ [libsystemd],
10
+
[have_systemd=yes], [have_systemd=no])
11
+
12
+
if test "x$with_systemd" = "xauto" ; then
13
+
@@ -912,7 +912,7 @@
14
+
AC_SUBST(SYSTEMD_LIBS)
15
+
16
+
PKG_CHECK_MODULES(JOURNALD,
17
+
- [libsystemd-journal],
18
+
+ [libsystemd],
19
+
[have_journald=yes], [have_journald=no])
20
+
21
+
if test "x$enable_systemd_journal" = "xauto" ; then