From 90160e5fe3f373d033fcedc8042677b8e3f0f74b Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Fri, 29 Sep 2023 16:05:11 +0300
Subject: [PATCH] libreoffice: reorder/reformat buildInputs a bit

The versionAtleast 7.4 is no longer needed due to still and fresh
variants' versions.
---
 pkgs/applications/office/libreoffice/default.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index c56218a7d365..e397136b02e1 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;