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

libreoffice-qt: wrap application

Browse Source 
Libreoffice-qt is not wrapped, thus does not launch. Notice that
wrapQtQAppsHook is used manually since all executables are shell
scripts which are not wrapped automatically.
This commit is contained in:
Jonas Meurer 2020-11-13 19:49:40 +01:00
parent f53113e56c
commit ea12d880e0
No known key found for this signature in database
GPG Key ID: 7D00DC06D0B220A0
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/applications/office/libreoffice/default.nix
View File

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