Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: dee059a32d93
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a4fdefeb39b6
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 14, 2020

  1. 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 ea12d88)
    @jmpunkt
    jmpunkt committed Nov 14, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    GPG key ID: 091DBF4D1FC46B8E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9ec5ef5 View commit details

  2. Merge pull request #103824 from jmpunkt/libreoffice-qt-wrap-backport 

    [20.09] libreoffice-qt: wrap application
    @7c6f434c
    7c6f434c authored Nov 14, 2020
    Copy the full SHA
    a4fdefe View commit details
Showing with 10 additions and 1 deletion.
  1. +10 −1 pkgs/applications/office/libreoffice/default.nix
11 changes: 10 additions & 1 deletion pkgs/applications/office/libreoffice/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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