From 9e0bf8497f75cba60b5c7e9d1f84b9488ff2f4cc Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 26 Jul 2023 12:54:36 +0200 Subject: libreoffice-qt: fix build Broke in 408ece7d3d5b68f5c0d870abb936ee8950a1b9f9 because the `disallowedRequisites` fails here since the QT variant apparently needs to reference a few dev outputs[1]. I won't look into the details of that now, so the easiest way to unbreak is to skip the check for the QT variant. It should be kept for non-QT though to make sure that a change similar to the BUILDCONFIG thing isn't missed again by us. [1] https://github.com/NixOS/nixpkgs/pull/245361#issuecomment-1651389735 error: output '/nix/store/2y0czyy26gcsqhmcvd2mlqa35f0gcl4l-libreoffice-7.5.4.1' is not allowed to refer to the following paths: /nix/store/0hmvklj0mbhrn8flwbcwivvkv45limhg-freetype-2.13.0-dev /nix/store/0rnx7rc87hwkbrhsys7mgwq4jw6pz7ma-zlib-1.2.13-dev [...] --- pkgs/applications/office/libreoffice/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'pkgs/applications/office/libreoffice') diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index cf769bf204780..70df53f1eb6b1 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -226,9 +226,10 @@ in # in the binary causing the closure size to blow up because of many unnecessary # dependencies to dev outputs. This behavior was patched away in nixpkgs # (see above), make sure these don't leak again by accident. - disallowedRequisites = lib.concatMap - (x: lib.optional (x?dev) x.dev) - buildInputs; + disallowedRequisites = lib.optionals (!kdeIntegration) + (lib.concatMap + (x: lib.optional (x?dev) x.dev) + buildInputs); ### QT/KDE # -- cgit 1.4.1