diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-09-03 10:51:11 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-09-03 10:51:11 +0200 |
| commit | 37242d98de844e26d5cf84734372218355a42b75 (patch) | |
| tree | fe37eac82b1538a072ae416d32049d778750a2df /pkgs/applications/display-managers/lightdm/default.nix | |
| parent | 825c08e368947e775278a74d58d269bb38c60c8f (diff) | |
| parent | 0529e4d90885b4e911162e8f8be077ae22322eba (diff) | |
| download | nixlib-37242d98de844e26d5cf84734372218355a42b75.tar nixlib-37242d98de844e26d5cf84734372218355a42b75.tar.gz nixlib-37242d98de844e26d5cf84734372218355a42b75.tar.bz2 nixlib-37242d98de844e26d5cf84734372218355a42b75.tar.lz nixlib-37242d98de844e26d5cf84734372218355a42b75.tar.xz nixlib-37242d98de844e26d5cf84734372218355a42b75.tar.zst nixlib-37242d98de844e26d5cf84734372218355a42b75.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/applications/display-managers/lightdm/default.nix')
| -rw-r--r-- | pkgs/applications/display-managers/lightdm/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index 191ec84f87bf..452cb38f126a 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pam, pkgconfig, libxcb, glib, libXdmcp, itstool, libxml2 -, intltool, xlibsWrapper, libxklavier, libgcrypt, libaudit, gcc6 +, intltool, xlibsWrapper, libxklavier, libgcrypt, libaudit , qt4 ? null , withQt5 ? false, qtbase }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool ]; buildInputs = [ pam libxcb glib libXdmcp itstool libxml2 libxklavier libgcrypt - qt4 libaudit gcc6 + qt4 libaudit ] ++ optional withQt5 qtbase; configureFlags = [ |