diff options
author | Thomas Tuegel <ttuegel@gmail.com> | 2015-09-27 10:37:23 -0500 |
---|---|---|
committer | Thomas Tuegel <ttuegel@gmail.com> | 2015-09-27 15:09:48 -0500 |
commit | 8d5b2be9aee480324e31c6c748bb02c8acbcde6f (patch) | |
tree | 6bdd01201bd32236f395092537d2ade2ca09dabe /pkgs/applications/display-managers | |
parent | 0331d7e7a7d2d5d1cf9486b5ef0b1adb1d8e2ddb (diff) |
lightdm_qt: build with Qt 5.5
Diffstat (limited to 'pkgs/applications/display-managers')
-rw-r--r-- | pkgs/applications/display-managers/lightdm/default.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index fb3235370206..dc50ced1a606 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, pam, pkgconfig, libxcb, glib, libXdmcp, itstool, libxml2 , intltool, xlibsWrapper, libxklavier, libgcrypt, libaudit -, qt4 ? null, qt5 ? null +, qt4 ? null +, withQt5 ? false, qtbase }: let @@ -20,14 +21,14 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig pam libxcb glib libXdmcp itstool libxml2 intltool libxklavier libgcrypt qt4 libaudit - ] ++ stdenv.lib.optional (qt5 != null) qt5.base; + ] ++ stdenv.lib.optional withQt5 qtbase; configureFlags = [ "--localstatedir=/var" "--sysconfdir=/etc" "--disable-tests" ] ++ stdenv.lib.optional (qt4 != null) "--enable-liblightdm-qt" - ++ stdenv.lib.optional ((qt5.base or null) != null) "--enable-liblightdm-qt5"; + ++ stdenv.lib.optional withQt5 "--enable-liblightdm-qt5"; installFlags = [ "sysconfdir=\${out}/etc" |