Merge pull request #103734 from jmpunkt/libreoffice-qt-wrap

libreoffice-qt: wrap application
This commit is contained in:
Michael Raskin 2020-11-14 15:54:18 +00:00 committed by GitHub
commit e3a88519b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -17,6 +17,7 @@
, withHelp ? true
, kdeIntegration ? false, mkDerivation ? null, qtbase ? null, qtx11extras ? null
, ki18n ? null, kconfig ? null, kcoreaddons ? null, kio ? null, kwindowsystem ? null
, wrapQtAppsHook ? null
, variant ? "fresh"
} @ args:
@ -303,8 +304,15 @@ in (mkDrv rec {
mkdir -p $dev
cp -r include $dev
'' + lib.optionalString kdeIntegration ''
for prog in $out/bin/*
do
wrapQtApp $prog
done
'';
dontWrapQtApps = true;
configureFlags = [
(if withHelp then "" else "--without-help")
"--with-boost=${boost.dev}"
@ -382,7 +390,8 @@ in (mkDrv rec {
nativeBuildInputs = [
gdb fontforge autoconf automake bison pkgconfig libtool
] ++ lib.optional (!kdeIntegration) wrapGAppsHook;
] ++ lib.optional (!kdeIntegration) wrapGAppsHook
++ lib.optional kdeIntegration wrapQtAppsHook;
buildInputs = with xorg;
[ ant ArchiveZip boost cairo clucene_core