mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-10-03 13:30:36 +00:00
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.
(cherry picked from commit ea12d880e0)
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user