lightdm: 1.14.2 -> 1.16.2

This commit is contained in:
William A. Kennington III 2015-09-17 23:24:48 -07:00
parent 5e254f57c7
commit 52b5acb2e4

View file

@ -1,30 +1,31 @@
{ stdenv, fetchurl, pam, pkgconfig, libxcb, glib, libXdmcp, itstool, libxml2 { stdenv, fetchurl, pam, pkgconfig, libxcb, glib, libXdmcp, itstool, libxml2
, intltool, x11, libxklavier, libgcrypt , intltool, x11, libxklavier, libgcrypt, libaudit
, qt4 ? null, qt5 ? null , qt4 ? null, qt5 ? null
}: }:
let let
ver_branch = "1.14"; ver_branch = "1.16";
version = "1.14.2"; version = "1.16.2";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "lightdm-${version}"; name = "lightdm-${version}";
src = fetchurl { src = fetchurl {
url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.xz"; url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.xz";
sha256 = "18dvipdkp6hc1hysyiwpd5nwq6db3mg98rwi3am2ly3hk2bpic18"; sha256 = "062jj21bjrl29mk66lpihwhrff038h2wny3p6b5asacf2mklf0hq";
}; };
patches = [ ./fix-paths.patch ]; patches = [ ./fix-paths.patch ];
buildInputs = [ buildInputs = [
pkgconfig pam libxcb glib libXdmcp itstool libxml2 intltool libxklavier libgcrypt pkgconfig pam libxcb glib libXdmcp itstool libxml2 intltool libxklavier libgcrypt
qt4 qt4 libaudit
] ++ stdenv.lib.optional (qt5 != null) qt5.base; ] ++ stdenv.lib.optional (qt5 != null) qt5.base;
configureFlags = [ configureFlags = [
"--localstatedir=/var" "--localstatedir=/var"
"--sysconfdir=/etc" "--sysconfdir=/etc"
"--disable-tests"
] ++ stdenv.lib.optional (qt4 != null) "--enable-liblightdm-qt" ] ++ stdenv.lib.optional (qt4 != null) "--enable-liblightdm-qt"
++ stdenv.lib.optional ((qt5.base or null) != null) "--enable-liblightdm-qt5"; ++ stdenv.lib.optional ((qt5.base or null) != null) "--enable-liblightdm-qt5";