lightdm: 1.18.1 -> 1.22.0 (#24545)

Remove patch
This commit is contained in:
ndowens
2017-04-02 10:04:32 +01:00
committed by obadz
parent cc779bc421
commit 7d076ab4fa
2 changed files with 11 additions and 71 deletions
@@ -4,38 +4,39 @@
, withQt5 ? false, qtbase
}:
with stdenv.lib;
let
ver_branch = "1.19";
version = "1.19.5";
ver_branch = "1.22";
version = "1.22.0";
in
stdenv.mkDerivation rec {
name = "lightdm-${version}";
src = fetchurl {
url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.xz";
sha256 = "0gbz8jk1ljh8rwgvldkiqma1k61sd27yh008228ahdqd5i2v1r1z";
sha256 = "0a5bvfl2h7r873al6q7c819h0kg564k9fh51rl6489z6lyvazfg4";
};
patches = [ ./fix-paths.patch ];
nativeBuildInputs = [ pkgconfig intltool ];
buildInputs = [
pkgconfig pam libxcb glib libXdmcp itstool libxml2 intltool libxklavier libgcrypt
pam libxcb glib libXdmcp itstool libxml2 libxklavier libgcrypt
qt4 libaudit gcc6
] ++ stdenv.lib.optional withQt5 qtbase;
] ++ optional withQt5 qtbase;
configureFlags = [
"--localstatedir=/var"
"--sysconfdir=/etc"
"--disable-tests"
] ++ stdenv.lib.optional (qt4 != null) "--enable-liblightdm-qt"
++ stdenv.lib.optional withQt5 "--enable-liblightdm-qt5";
] ++ optional (qt4 != null) "--enable-liblightdm-qt"
++ optional withQt5 "--enable-liblightdm-qt5";
installFlags = [
"sysconfdir=\${out}/etc"
"localstatedir=\${TMPDIR}"
];
meta = with stdenv.lib; {
meta = {
homepage = https://launchpad.net/lightdm;
platforms = platforms.linux;
license = licenses.gpl3;