diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2019-12-19 15:51:01 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-19 15:51:01 +0000 |
| commit | d7a0236c4c284aefa083b4693cee2532c9502603 (patch) | |
| tree | 880115c1272732023c073d8c7b9f1b545fbc6c70 /pkgs/top-level | |
| parent | 6210c155738d9428de24c18f0d6bd85a41918d93 (diff) | |
| parent | 737ce5c8480139e89d1e8087f4534297c5856d89 (diff) | |
| download | nixpkgs-d7a0236c4c284aefa083b4693cee2532c9502603.tar nixpkgs-d7a0236c4c284aefa083b4693cee2532c9502603.tar.gz nixpkgs-d7a0236c4c284aefa083b4693cee2532c9502603.tar.bz2 nixpkgs-d7a0236c4c284aefa083b4693cee2532c9502603.tar.lz nixpkgs-d7a0236c4c284aefa083b4693cee2532c9502603.tar.xz nixpkgs-d7a0236c4c284aefa083b4693cee2532c9502603.tar.zst nixpkgs-d7a0236c4c284aefa083b4693cee2532c9502603.zip | |
Merge pull request #75850 from mmilata/libreoffice-refactor
libreoffice: merge -still and -fresh into common expression
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 801c86d0d84..4e0f2060ef3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19794,13 +19794,15 @@ in libreoffice-fresh = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { libreoffice = callPackage ../applications/office/libreoffice (libreoffice-args // { + variant = "fresh"; }); }); libreoffice-fresh-unwrapped = libreoffice-fresh.libreoffice; libreoffice-still = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { - libreoffice = callPackage ../applications/office/libreoffice/still.nix + libreoffice = callPackage ../applications/office/libreoffice (libreoffice-args // { + variant = "still"; }); }); libreoffice-still-unwrapped = libreoffice-still.libreoffice; |