public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gdm: fix build with systemd 230

Browse Source
This commit is contained in:
Luca Bruno 2016-05-27 11:17:23 +02:00
parent 1fb49e8089
commit ef8ea38fe8
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/desktops/gnome-3/3.18/core/gdm/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, glib, itstool, libxml2, xorg, dbus { stdenv, fetchurl, pkgconfig, glib, itstool, libxml2, xorg, dbus
, intltool, accountsservice, libX11, gnome3, systemd, gnome_session , intltool, accountsservice, libX11, gnome3, systemd, gnome_session, autoreconfHook
, gtk, libcanberra_gtk3, pam, libtool, gobjectIntrospection }: , gtk, libcanberra_gtk3, pam, libtool, gobjectIntrospection }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
"--with-systemd=yes" "--with-systemd=yes"
"--with-systemdsystemunitdir=$(out)/etc/systemd/system" ]; "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ];
buildInputs = [ pkgconfig glib itstool libxml2 intltool buildInputs = [ pkgconfig glib itstool libxml2 intltool autoreconfHook
accountsservice gnome3.dconf systemd accountsservice gnome3.dconf systemd
gobjectIntrospection libX11 gtk gobjectIntrospection libX11 gtk
libcanberra_gtk3 pam libtool ]; libcanberra_gtk3 pam libtool ];
@ -28,7 +28,8 @@ stdenv.mkDerivation rec {
# Disable Access Control because our X does not support FamilyServerInterpreted yet # Disable Access Control because our X does not support FamilyServerInterpreted yet
patches = [ ./xserver_path.patch ./sessions_dir.patch patches = [ ./xserver_path.patch ./sessions_dir.patch
./disable_x_access_control.patch ./no-dbus-launch.patch ]; ./disable_x_access_control.patch ./no-dbus-launch.patch
./libsystemd.patch ];
installFlags = [ "sysconfdir=$(out)/etc" "dbusconfdir=$(out)/etc/dbus-1/system.d" ]; installFlags = [ "sysconfdir=$(out)/etc" "dbusconfdir=$(out)/etc/dbus-1/system.d" ];

21
pkgs/desktops/gnome-3/3.18/core/gdm/libsystemd.patch Normal file
View File

@ -0,0 +1,21 @@
https://github.com/GNOME/gdm/commit/eee5bf72c9bb1c1d62eb0e7102088ae3b9a188cd
--- a/configure.ac 2016-05-27 11:10:44.589740789 +0200
+++ b/configure.ac 2016-05-27 11:11:00.146427723 +0200
@@ -888,7 +888,7 @@
dnl ---------------------------------------------------------------------------
PKG_CHECK_MODULES(SYSTEMD,
- [libsystemd-login >= 186 libsystemd-daemon],
+ [libsystemd],
[have_systemd=yes], [have_systemd=no])
if test "x$with_systemd" = "xauto" ; then
@@ -912,7 +912,7 @@
AC_SUBST(SYSTEMD_LIBS)
PKG_CHECK_MODULES(JOURNALD,
- [libsystemd-journal],
+ [libsystemd],
[have_journald=yes], [have_journald=no])
if test "x$enable_systemd_journal" = "xauto" ; then