public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libreoffice: explicitly disable unsupported GTK2 (#89529)

Browse Source 
* libreoffice: explicitly disable GTK2 which we no longer support

* libreoffice: version check is more explicit
This commit is contained in:
Peter Hoeg 2020-06-06 08:48:15 +08:00 committed by GitHub
parent bf7644a4d1
commit dfbc6b3a26
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/applications/office/libreoffice/default.nix
View File

@ -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 , IOCompress, zlib, libjpeg, expat, freetype, libwpd
, libxml2, db, curl, fontconfig, libsndfile, neon , libxml2, db, curl, fontconfig, libsndfile, neon
, bison, flex, zip, unzip, gtk3, libmspack, getopt, file, cairo, which , bison, flex, zip, unzip, gtk3, libmspack, getopt, file, cairo, which
@ -29,7 +29,6 @@ let
inherit (primary-src) major minor subdir version; inherit (primary-src) major minor subdir version;
lib = stdenv.lib;
langsSpaces = lib.concatStringsSep " " langs; langsSpaces = lib.concatStringsSep " " langs;
mkDrv = if kdeIntegration then mkDerivation else stdenv.mkDerivation; 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. # are in multiple directories due to each having their own derivation.
postPatch = let postPatch = let
inc = e: path: inc = e: path:
"${e.dev}/include/KF5/${path}"; "${lib.getDev e}/include/KF5/${path}";
libs = list: libs = list:
lib.concatMapStringsSep " " (e: "-L${e.out}/lib") list; lib.concatMapStringsSep " " (e: "-L${lib.getLib e}/lib") list;
in '' in ''
substituteInPlace shell/source/unix/exec/shellexec.cxx \ substituteInPlace shell/source/unix/exec/shellexec.cxx \
--replace /usr/bin/xdg-open ${if kdeIntegration then "kde-open5" else "xdg-open"} --replace /usr/bin/xdg-open ${if kdeIntegration then "kde-open5" else "xdg-open"}
@ -377,7 +376,7 @@ in (mkDrv rec {
"--enable-kf5" "--enable-kf5"
"--enable-qt5" "--enable-qt5"
"--enable-gtk3-kde5" "--enable-gtk3-kde5"
]; ] ++ lib.optional (lib.versionOlder version "6.4") "--disable-gtk"; # disables GTK2, GTK3 is still there
checkPhase = '' checkPhase = ''
make unitcheck make unitcheck