pyrox.dev / nixpkgs
lol
fork atom

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

K900 53ade61b efa8a084

+33 -20
unified split
+33 -20
pkgs/applications/office/libreoffice/default.nix
··· 101 libetonyek, 102 liborcus, 103 libpng, 104 langs ? [ 105 "ar" 106 "ca" ··· 378 substituteInPlace configure.ac --replace-fail distutils.sysconfig sysconfig 379 ''; 380 381 - nativeBuildInputs = [ 382 - autoconf 383 - automake 384 - bison 385 - fontforge 386 - gdb 387 - jdk21 388 - libtool 389 - pkg-config 390 - ]; 391 392 buildInputs = 393 finalAttrs.passthru.gst_packages ··· 397 # propagated libpng 398 # See: https://www.mail-archive.com/libreoffice@lists.freedesktop.org/msg334080.html 399 (libpng.override { apngSupport = false; }) 400 - perlPackages.ArchiveZip 401 coinmp 402 - perlPackages.IOCompress 403 abseil-cpp 404 - ant 405 bluez5 406 boost 407 box2d_2 ··· 414 dbus-glib 415 expat 416 file 417 - flex 418 fontconfig 419 freetype 420 getopt 421 - gettext 422 glib 423 glm 424 adwaita-icon-theme 425 - gperf 426 gpgme 427 graphite2 428 gtk3 ··· 433 lcms2 434 libGL 435 libGLU 436 xorg.libX11 437 xorg.libXaw 438 xorg.libXdmcp ··· 454 liblangtag 455 libmspack 456 libmwaw 457 - libmysqlclient 458 libodfgen 459 liborcus 460 xorg.libpthreadstubs ··· 466 libwpd 467 libwpg 468 libwps 469 libxml2 470 xorg.libxshmfence 471 libxslt ··· 481 openldap 482 openssl 483 pam 484 - perl 485 poppler 486 libpq 487 python311 488 sane-backends 489 unixODBC 490 - unzip 491 util-linux 492 which 493 xmlsec 494 - zip 495 zlib 496 ] 497 ++ optionals kdeIntegration [ ··· 690 691 # Wrapping is done in ./wrapper.nix 692 dontWrapQtApps = true; 693 694 passthru = { 695 inherit srcs;
··· 101 libetonyek, 102 liborcus, 103 libpng, 104 + libxcrypt, 105 langs ? [ 106 "ar" 107 "ca" ··· 379 substituteInPlace configure.ac --replace-fail distutils.sysconfig sysconfig 380 ''; 381 382 + nativeBuildInputs = 383 + [ 384 + ant 385 + autoconf 386 + automake 387 + bison 388 + flex 389 + fontforge 390 + gdb 391 + gettext 392 + gperf 393 + icu 394 + jdk21 395 + libmysqlclient 396 + libtool 397 + libxml2 398 + libxslt 399 + perl 400 + perlPackages.ArchiveZip 401 + perlPackages.IOCompress 402 + pkg-config 403 + python311 404 + unzip 405 + zip 406 + ] 407 + ++ optionals kdeIntegration [ 408 + qtbase 409 + ]; 410 411 buildInputs = 412 finalAttrs.passthru.gst_packages ··· 416 # propagated libpng 417 # See: https://www.mail-archive.com/libreoffice@lists.freedesktop.org/msg334080.html 418 (libpng.override { apngSupport = false; }) 419 coinmp 420 abseil-cpp 421 bluez5 422 boost 423 box2d_2 ··· 430 dbus-glib 431 expat 432 file 433 fontconfig 434 freetype 435 getopt 436 glib 437 glm 438 adwaita-icon-theme 439 gpgme 440 graphite2 441 gtk3 ··· 446 lcms2 447 libGL 448 libGLU 449 + libtool 450 xorg.libX11 451 xorg.libXaw 452 xorg.libXdmcp ··· 468 liblangtag 469 libmspack 470 libmwaw 471 libodfgen 472 liborcus 473 xorg.libpthreadstubs ··· 479 libwpd 480 libwpg 481 libwps 482 + libxcrypt 483 libxml2 484 xorg.libxshmfence 485 libxslt ··· 495 openldap 496 openssl 497 pam 498 poppler 499 libpq 500 python311 501 sane-backends 502 unixODBC 503 util-linux 504 which 505 xmlsec 506 zlib 507 ] 508 ++ optionals kdeIntegration [ ··· 701 702 # Wrapping is done in ./wrapper.nix 703 dontWrapQtApps = true; 704 + 705 + strictDeps = true; 706 707 passthru = { 708 inherit srcs;