dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

lightdm_qt: build with Qt 5.5

Browse Source
This commit is contained in:
Thomas Tuegel 2015-09-27 10:37:23 -05:00
parent 0331d7e7a7
commit 8d5b2be9ae
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/display-managers/lightdm/default.nix
View File

@ -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"

6
pkgs/top-level/all-packages.nix
View File

@ -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 { };