gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "libreoffice: move darwin to separate libreoffice-darwin package"

Browse Source 
Introducing a new name for each complex darwin derivation does not
scale.

This reverts commit b207ef980751b2dfe2f222fbd7dbc854f9bd90bf.
This commit is contained in:
Thibault Gagnaux
2022-05-27 17:28:31 +02:00
parent d4dd3f5f7e
commit b9a5485aa5
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/office/libreoffice/darwin/default.nix → pkgs/applications/office/libreoffice/darwin/darwin.nix
View File
pkgs/top-level/all-packages.nix
+3 -2
View File
@@ -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 = {