BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

libreoffice: rename libreoffice -> libreoffice-bin

Browse source
This commit is contained in:
Thibault Gagnaux 2022-05-28 17:40:04 +02:00
parent 56ce01eca3
commit fe949d64ef
No known key found for this signature in database
GPG key ID: 44BD0764ACAE8E25
4 changed files with 22 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/applications/office/libreoffice/common.nix
View file

@ -1,10 +0,0 @@
{ lib }:
{
meta = with lib; {
description = "Comprehensive, professional-quality productivity suite, a variant of openoffice.org";
homepage = "https://libreoffice.org/";
license = licenses.lgpl3;
maintainers = with maintainers; [ raskin tricktron ];
platforms = platforms.linux ++ [ "x86_64-darwin" "aarch64-darwin" ];
};
}

17
pkgs/applications/office/libreoffice/darwin/default.nix
View file

@ -10,7 +10,6 @@ let
appName = "LibreOffice.app";
scriptName = "soffice";
version = "7.3.3";
common = import ../common.nix { inherit lib; };
dist = {
aarch64-darwin = rec {
@ -30,7 +29,6 @@ let
in
stdenvNoCC.mkDerivation {
inherit version;
inherit (import ../common.nix { inherit lib; }) meta;
pname = "libreoffice";
src = fetchurl {
inherit (dist.${stdenvNoCC.hostPlatform.system} or
@ -69,9 +67,16 @@ stdenvNoCC.mkDerivation {
set -eou pipefail
# reset version first so that both platforms are always updated and in sync
update-source-version libreoffice 0 ${lib.fakeSha256} --file=${currentFile} --system=aarch64-darwin
update-source-version libreoffice ${newVersion} ${newAarch64Sha256} --file=${currentFile} --system=aarch64-darwin
update-source-version libreoffice 0 ${lib.fakeSha256} --file=${currentFile} --system=x86_64-darwin
update-source-version libreoffice ${newVersion} ${newX86_64Sha256} --file=${currentFile} --system=x86_64-darwin
update-source-version libreoffice-bin 0 ${lib.fakeSha256} --file=${currentFile} --system=aarch64-darwin
update-source-version libreoffice-bin ${newVersion} ${newAarch64Sha256} --file=${currentFile} --system=aarch64-darwin
update-source-version libreoffice-bin 0 ${lib.fakeSha256} --file=${currentFile} --system=x86_64-darwin
update-source-version libreoffice-bin ${newVersion} ${newX86_64Sha256} --file=${currentFile} --system=x86_64-darwin
'';
meta = with lib; {
description = "Comprehensive, professional-quality productivity suite, a variant of openoffice.org";
homepage = "https://libreoffice.org/";
license = licenses.lgpl3;
maintainers = with maintainers; [ tricktron ];
platforms = [ "x86_64-darwin" "aarch64-darwin" ];
};
}

8
pkgs/applications/office/libreoffice/default.nix
View file

@ -581,5 +581,11 @@ in
requiredSystemFeatures = [ "big-parallel" ];
inherit (import ./common.nix { inherit lib; }) meta;
meta = with lib; {
description = "Comprehensive, professional-quality productivity suite, a variant of openoffice.org";
homepage = "https://libreoffice.org/";
license = licenses.lgpl3;
maintainers = with maintainers; [ raskin ];
platforms = platforms.linux;
};
}).overrideAttrs ((importVariant "override.nix") (args // { inherit kdeIntegration; }))

7
pkgs/top-level/all-packages.nix
View file

@ -27772,9 +27772,10 @@ with pkgs;
boost = boost175;
};
libreoffice = if stdenv.isDarwin
then callPackage ../applications/office/libreoffice/darwin { }
else hiPrio libreoffice-still;
libreoffice-bin = callPackage ../applications/office/libreoffice/darwin { };
libreoffice = hiPrio libreoffice-still;
libreoffice-unwrapped = (hiPrio libreoffice-still).libreoffice;
libreoffice-args = {