From d4dd3f5f7e2f1df1e57f933504f942404e8eca9c Mon Sep 17 00:00:00 2001 From: Thibault Gagnaux Date: Fri, 27 May 2022 10:46:00 +0200 Subject: [PATCH] libreoffice: move darwin to separate libreoffice-darwin package The linux and darwin derivations are completely different. Therefore, it makes more sense to treat them as two separate, independent derivations. --- .../office/libreoffice/darwin/{darwin.nix => default.nix} | 0 pkgs/top-level/all-packages.nix | 5 ++--- 2 files changed, 2 insertions(+), 3 deletions(-) rename pkgs/applications/office/libreoffice/darwin/{darwin.nix => default.nix} (100%) diff --git a/pkgs/applications/office/libreoffice/darwin/darwin.nix b/pkgs/applications/office/libreoffice/darwin/default.nix similarity index 100% rename from pkgs/applications/office/libreoffice/darwin/darwin.nix rename to pkgs/applications/office/libreoffice/darwin/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 194229f944c1..efd142af7e7a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27772,9 +27772,8 @@ with pkgs; boost = boost175; }; - libreoffice = if stdenv.isDarwin - then callPackage ../applications/office/libreoffice/darwin/darwin.nix {} - else hiPrio libreoffice-still; + libreoffice-darwin = callPackage ../applications/office/libreoffice/darwin {}; + libreoffice = hiPrio libreoffice-still; libreoffice-unwrapped = (hiPrio libreoffice-still).libreoffice; libreoffice-args = {