git.iko.soy/typeable/nixpkgs
on master help sign in
libreoffice: explicitly disable unsupported GTK2 (#89529)

* libreoffice: explicitly disable GTK2 which we no longer support * libreoffice: version check is more explicit

commitdfbc6b3a269699c9b0e05f83735532c6deca39b8 authorPeter Hoeg <peter@hoeg.com> dateSat 6 Jun 2020, 08:48 (6 years ago) parentbf7644a
1 file changed+4−5
pkgs/applications/office/libreoffice/default.nix+4−5
pkgs/applications/office/libreoffice/default.nix+4−5
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, fetchpatch, pam, python3, libxslt, perl, ArchiveZip, gettext
1+{ stdenv, fetchurl, fetchpatch, lib, pam, python3, libxslt, perl, ArchiveZip, gettext
22, IOCompress, zlib, libjpeg, expat, freetype, libwpd
33, libxml2, db, curl, fontconfig, libsndfile, neon
44, bison, flex, zip, unzip, gtk3, libmspack, getopt, file, cairo, which
@@ -29,7 +29,6 @@ let
2929
3030 inherit (primary-src) major minor subdir version;
3131
32− lib = stdenv.lib;
3332 langsSpaces = lib.concatStringsSep " " langs;
3433
3534 mkDrv = if kdeIntegration then mkDerivation else stdenv.mkDerivation;
@@ -96,9 +95,9 @@ in (mkDrv rec {
9695 # are in multiple directories due to each having their own derivation.
9796 postPatch = let
9897 inc = e: path:
99− "${e.dev}/include/KF5/${path}";
98+ "${lib.getDev e}/include/KF5/${path}";
10099 libs = list:
101− lib.concatMapStringsSep " " (e: "-L${e.out}/lib") list;
100+ lib.concatMapStringsSep " " (e: "-L${lib.getLib e}/lib") list;
102101 in ''
103102 substituteInPlace shell/source/unix/exec/shellexec.cxx \
104103 --replace /usr/bin/xdg-open ${if kdeIntegration then "kde-open5" else "xdg-open"}
@@ -377,7 +376,7 @@ in (mkDrv rec {
377376 "--enable-kf5"
378377 "--enable-qt5"
379378 "--enable-gtk3-kde5"
380− ];
379+ ] ++ lib.optional (lib.versionOlder version "6.4") "--disable-gtk"; # disables GTK2, GTK3 is still there
381380
382381 checkPhase = ''
383382 make unitcheck