diff options
| author | Jonas Meurer <jmpunkt@outlook.com> | 2020-11-13 19:49:40 +0100 |
|---|---|---|
| committer | Jonas Meurer <jmpunkt@outlook.com> | 2020-11-13 19:55:28 +0100 |
| commit | ea12d880e0fd9b2f08f4f974c8af849bfd59a230 (patch) | |
| tree | 14973136db80d4b656e63fda426b24ebd2212f25 /pkgs/applications/office | |
| parent | f53113e56c346d0c83de32e9440129d17587f37f (diff) | |
libreoffice-qt: wrap application
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.
Diffstat (limited to 'pkgs/applications/office')
| -rw-r--r-- | pkgs/applications/office/libreoffice/default.nix | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 2f961f43da0a3..1023af9234c9d 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -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 |