diff options
| author | Thibault Gagnaux <tgagnaux@gmail.com> | 2022-05-27 14:37:33 +0200 |
|---|---|---|
| committer | Thibault Gagnaux <tgagnaux@gmail.com> | 2022-05-27 17:28:31 +0200 |
| commit | b9a5485aa5ebe0547de52f04603831d74f00e1f8 (patch) | |
| tree | 52debc55ed0f9211b22cfb9d7b5d9d74548ae198 | |
| parent | d4dd3f5f7e2f1df1e57f933504f942404e8eca9c (diff) | |
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.
| -rw-r--r-- | pkgs/applications/office/libreoffice/darwin/darwin.nix (renamed from pkgs/applications/office/libreoffice/darwin/default.nix) | 0 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/applications/office/libreoffice/darwin/default.nix b/pkgs/applications/office/libreoffice/darwin/darwin.nix index 2228d6bbfe6fd..2228d6bbfe6fd 100644 --- a/pkgs/applications/office/libreoffice/darwin/default.nix +++ b/pkgs/applications/office/libreoffice/darwin/darwin.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index efd142af7e7a6..194229f944c1c 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 = { |