mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 23:03:40 +01: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.
This commit is contained in:
parent
f53113e56c
commit
ea12d880e0
1 changed files with 10 additions and 1 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue