From 8d5b2be9aee480324e31c6c748bb02c8acbcde6f Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 27 Sep 2015 10:37:23 -0500
Subject: [PATCH] lightdm_qt: build with Qt 5.5

---
 pkgs/applications/display-managers/lightdm/default.nix | 7 ++++---
 pkgs/top-level/all-packages.nix                        | 6 +++---
 2 files changed, 7 insertions(+), 6 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"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 84e70d7c54ca..c182e5d9aa01 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12682,12 +12682,12 @@ let
 
   dropbox-cli = callPackage ../applications/networking/dropbox-cli { };
 
-  lightdm = callPackage ../applications/display-managers/lightdm {
+  lightdm = qt5Libs.callPackage ../applications/display-managers/lightdm {
     qt4 = null;
-    qt5 = null;
+    withQt5 = false;
   };
 
-  lightdm_qt = lightdm.override { qt5 = qt5; };
+  lightdm_qt = lightdm.override { withQt5 = true; };
 
   lightdm_gtk_greeter = callPackage ../applications/display-managers/lightdm-gtk-greeter { };