diff options
| author | Peter Hoeg <peter@hoeg.com> | 2020-06-06 08:48:15 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-06 08:48:15 +0800 |
| commit | dfbc6b3a269699c9b0e05f83735532c6deca39b8 (patch) | |
| tree | 7cc3b0d887e0a51e565b9ee2d1e768ac19c26a57 /pkgs/applications/office/libreoffice | |
| parent | bf7644a4d1f30089be628f0d665a8a167e05af69 (diff) | |
| download | nixpkgs-dfbc6b3a269699c9b0e05f83735532c6deca39b8.tar nixpkgs-dfbc6b3a269699c9b0e05f83735532c6deca39b8.tar.gz nixpkgs-dfbc6b3a269699c9b0e05f83735532c6deca39b8.tar.bz2 nixpkgs-dfbc6b3a269699c9b0e05f83735532c6deca39b8.tar.lz nixpkgs-dfbc6b3a269699c9b0e05f83735532c6deca39b8.tar.xz nixpkgs-dfbc6b3a269699c9b0e05f83735532c6deca39b8.tar.zst nixpkgs-dfbc6b3a269699c9b0e05f83735532c6deca39b8.zip | |
libreoffice: explicitly disable unsupported GTK2 (#89529)
* libreoffice: explicitly disable GTK2 which we no longer support * libreoffice: version check is more explicit
Diffstat (limited to 'pkgs/applications/office/libreoffice')
| -rw-r--r-- | pkgs/applications/office/libreoffice/default.nix | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 1fefb46692d..66e12b22173 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pam, python3, libxslt, perl, ArchiveZip, gettext +{ stdenv, fetchurl, fetchpatch, lib, pam, python3, libxslt, perl, ArchiveZip, gettext , IOCompress, zlib, libjpeg, expat, freetype, libwpd , libxml2, db, curl, fontconfig, libsndfile, neon , bison, flex, zip, unzip, gtk3, libmspack, getopt, file, cairo, which @@ -29,7 +29,6 @@ let inherit (primary-src) major minor subdir version; - lib = stdenv.lib; langsSpaces = lib.concatStringsSep " " langs; mkDrv = if kdeIntegration then mkDerivation else stdenv.mkDerivation; @@ -96,9 +95,9 @@ in (mkDrv rec { # are in multiple directories due to each having their own derivation. postPatch = let inc = e: path: - "${e.dev}/include/KF5/${path}"; + "${lib.getDev e}/include/KF5/${path}"; libs = list: - lib.concatMapStringsSep " " (e: "-L${e.out}/lib") list; + lib.concatMapStringsSep " " (e: "-L${lib.getLib e}/lib") list; in '' substituteInPlace shell/source/unix/exec/shellexec.cxx \ --replace /usr/bin/xdg-open ${if kdeIntegration then "kde-open5" else "xdg-open"} @@ -377,7 +376,7 @@ in (mkDrv rec { "--enable-kf5" "--enable-qt5" "--enable-gtk3-kde5" - ]; + ] ++ lib.optional (lib.versionOlder version "6.4") "--disable-gtk"; # disables GTK2, GTK3 is still there checkPhase = '' make unitcheck |