From b9a5485aa5ebe0547de52f04603831d74f00e1f8 Mon Sep 17 00:00:00 2001 From: Thibault Gagnaux Date: Fri, 27 May 2022 14:37:33 +0200 Subject: [PATCH] Revert "libreoffice: move darwin to separate libreoffice-darwin package" Introducing a new name for each complex darwin derivation does not scale. This reverts commit b207ef980751b2dfe2f222fbd7dbc854f9bd90bf. --- .../office/libreoffice/darwin/{default.nix => darwin.nix} | 0 pkgs/top-level/all-packages.nix | 5 +++-- 2 files changed, 3 insertions(+), 2 deletions(-) rename pkgs/applications/office/libreoffice/darwin/{default.nix => darwin.nix} (100%) diff --git a/pkgs/applications/office/libreoffice/darwin/default.nix b/pkgs/applications/office/libreoffice/darwin/darwin.nix similarity index 100% rename from pkgs/applications/office/libreoffice/darwin/default.nix rename to pkgs/applications/office/libreoffice/darwin/darwin.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index efd142af7e7a..194229f944c1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27772,8 +27772,9 @@ with pkgs; boost = boost175; }; - libreoffice-darwin = callPackage ../applications/office/libreoffice/darwin {}; - libreoffice = hiPrio libreoffice-still; + libreoffice = if stdenv.isDarwin + then callPackage ../applications/office/libreoffice/darwin/darwin.nix {} + else hiPrio libreoffice-still; libreoffice-unwrapped = (hiPrio libreoffice-still).libreoffice; libreoffice-args = {