Commit 53ade61b authored by K900's avatar K900
Browse files

libreoffice: fix build under strictDeps 

This fixes an upcoming issue with KDE builds, where
we end up with a native libpng-apng earlier in the
search paths due to propagation

  libreoffice -> extra-cmake-modules -> qttools -> qtbase -> libpng-apng
parent efa8a084

pkgs/applications/office/libreoffice/default.nix

+33 −20
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ 
  libetonyek,

  liborcus,

  libpng,

  libxcrypt,

  langs ? [

    "ar"

    "ca"
@@ -378,15 +379,33 @@ stdenv.mkDerivation (finalAttrs: { 
    substituteInPlace configure.ac --replace-fail distutils.sysconfig sysconfig

  '';



  nativeBuildInputs = [

  nativeBuildInputs =

    [

      ant

      autoconf

      automake

      bison

      flex

      fontforge

      gdb

      gettext

      gperf

      icu

      jdk21

      libmysqlclient

      libtool

      libxml2

      libxslt

      perl

      perlPackages.ArchiveZip

      perlPackages.IOCompress

      pkg-config

      python311

      unzip

      zip

    ]

    ++ optionals kdeIntegration [

      qtbase

    ];



  buildInputs =
@@ -397,11 +416,8 @@ stdenv.mkDerivation (finalAttrs: { 
      # propagated libpng

      # See: https://www.mail-archive.com/libreoffice@lists.freedesktop.org/msg334080.html

      (libpng.override { apngSupport = false; })

      perlPackages.ArchiveZip

      coinmp

      perlPackages.IOCompress

      abseil-cpp

      ant

      bluez5

      boost

      box2d_2
@@ -414,15 +430,12 @@ stdenv.mkDerivation (finalAttrs: { 
      dbus-glib

      expat

      file

      flex

      fontconfig

      freetype

      getopt

      gettext

      glib

      glm

      adwaita-icon-theme

      gperf

      gpgme

      graphite2

      gtk3
@@ -433,6 +446,7 @@ stdenv.mkDerivation (finalAttrs: { 
      lcms2

      libGL

      libGLU

      libtool

      xorg.libX11

      xorg.libXaw

      xorg.libXdmcp
@@ -454,7 +468,6 @@ stdenv.mkDerivation (finalAttrs: { 
      liblangtag

      libmspack

      libmwaw

      libmysqlclient

      libodfgen

      liborcus

      xorg.libpthreadstubs
@@ -466,6 +479,7 @@ stdenv.mkDerivation (finalAttrs: { 
      libwpd

      libwpg

      libwps

      libxcrypt

      libxml2

      xorg.libxshmfence

      libxslt
@@ -481,17 +495,14 @@ stdenv.mkDerivation (finalAttrs: { 
      openldap

      openssl

      pam

      perl

      poppler

      libpq

      python311

      sane-backends

      unixODBC

      unzip

      util-linux

      which

      xmlsec

      zip

      zlib

    ]

    ++ optionals kdeIntegration [
@@ -691,6 +702,8 @@ stdenv.mkDerivation (finalAttrs: { 
  # Wrapping is done in ./wrapper.nix

  dontWrapQtApps = true;



  strictDeps = true;



  passthru = {

    inherit srcs;

    jdk = jre';