diff options
| author | Doron Behar <doron.behar@gmail.com> | 2023-09-29 16:05:11 +0300 |
|---|---|---|
| committer | Doron Behar <doron.behar@gmail.com> | 2023-09-29 19:10:01 +0300 |
| commit | 90160e5fe3f373d033fcedc8042677b8e3f0f74b (patch) | |
| tree | df866b02eba9b571b6939c1d817504b8ccee9818 /pkgs/applications/office | |
| parent | 27b1afd0063b5f619c02183127b7e5e2c985cd31 (diff) | |
| download | nixpkgs-90160e5fe3f373d033fcedc8042677b8e3f0f74b.tar nixpkgs-90160e5fe3f373d033fcedc8042677b8e3f0f74b.tar.gz nixpkgs-90160e5fe3f373d033fcedc8042677b8e3f0f74b.tar.bz2 nixpkgs-90160e5fe3f373d033fcedc8042677b8e3f0f74b.tar.lz nixpkgs-90160e5fe3f373d033fcedc8042677b8e3f0f74b.tar.xz nixpkgs-90160e5fe3f373d033fcedc8042677b8e3f0f74b.tar.zst nixpkgs-90160e5fe3f373d033fcedc8042677b8e3f0f74b.zip | |
libreoffice: reorder/reformat buildInputs a bit
The versionAtleast 7.4 is no longer needed due to still and fresh variants' versions.
Diffstat (limited to 'pkgs/applications/office')
| -rw-r--r-- | pkgs/applications/office/libreoffice/default.nix | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index c56218a7d36..e397136b02e 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -509,7 +509,7 @@ in stdenv.mkDerivation (finalAttrs: { wrapQtAppsHook ]; - buildInputs = with xorg; [ + buildInputs = with xorg; finalAttrs.passthru.gst_packages ++ [ ArchiveZip CoinMP IOCompress @@ -578,6 +578,7 @@ in stdenv.mkDerivation (finalAttrs: { libxshmfence libxslt libzmf + libwebp mdds mythes ncurses @@ -598,10 +599,12 @@ in stdenv.mkDerivation (finalAttrs: { which zip zlib - ] - ++ finalAttrs.passthru.gst_packages - ++ optionals kdeIntegration [ qtbase qtx11extras kcoreaddons kio ] - ++ optionals (lib.versionAtLeast (lib.versions.majorMinor version) "7.4") [ libwebp ]; + ] ++ optionals kdeIntegration [ + qtbase + qtx11extras + kcoreaddons + kio + ]; passthru = { inherit srcs; |