Merge pull request #259356 from maxaudron/quassel-ldap

This commit is contained in:
Thomas Tuegel 2023-10-15 07:10:42 -05:00 committed by GitHub
commit d7e27f5250
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -6,7 +6,7 @@
, lib, stdenv, fetchFromGitHub, cmake, makeWrapper, dconf , lib, stdenv, fetchFromGitHub, cmake, makeWrapper, dconf
, mkDerivation, qtbase, boost, zlib, qtscript , mkDerivation, qtbase, boost, zlib, qtscript
, phonon, libdbusmenu, qca-qt5 , phonon, libdbusmenu, qca-qt5, openldap
, withKDE ? true # enable KDE integration , withKDE ? true # enable KDE integration
, extra-cmake-modules , extra-cmake-modules
@ -47,7 +47,7 @@ in (if !buildClient then stdenv.mkDerivation else mkDerivation) rec {
nativeBuildInputs = [ cmake makeWrapper ]; nativeBuildInputs = [ cmake makeWrapper ];
buildInputs = [ qtbase boost zlib ] buildInputs = [ qtbase boost zlib ]
++ lib.optionals buildCore [qtscript qca-qt5 ] ++ lib.optionals buildCore [qtscript qca-qt5 openldap]
++ lib.optionals buildClient [libdbusmenu phonon] ++ lib.optionals buildClient [libdbusmenu phonon]
++ lib.optionals (buildClient && withKDE) [ ++ lib.optionals (buildClient && withKDE) [
extra-cmake-modules kconfigwidgets kcoreaddons extra-cmake-modules kconfigwidgets kcoreaddons
@ -62,6 +62,7 @@ in (if !buildClient then stdenv.mkDerivation else mkDerivation) rec {
++ edf static "STATIC" ++ edf static "STATIC"
++ edf monolithic "WANT_MONO" ++ edf monolithic "WANT_MONO"
++ edf enableDaemon "WANT_CORE" ++ edf enableDaemon "WANT_CORE"
++ edf enableDaemon "WITH_LDAP"
++ edf client "WANT_QTCLIENT" ++ edf client "WANT_QTCLIENT"
++ edf withKDE "WITH_KDE"; ++ edf withKDE "WITH_KDE";