nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-11 16:23:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

libreoffice: apply suggestions from code review

Browse Source 
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
This commit is contained in:
tricktron 2022-05-25 21:21:25 +02:00 committed by Thibault Gagnaux
parent ccfd4255bb
commit d679ccc970
No known key found for this signature in database
GPG Key ID: 44BD0764ACAE8E25
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/applications/office/libreoffice/darwin/darwin.nix
View File

@ -9,19 +9,18 @@ let
appName = "LibreOffice.app";
scriptName = "soffice";
version = "7.3.3";
baseUrl = "https://download.documentfoundation.org/libreoffice/stable";
dist = {
aarch64-darwin = rec {
arch = "aarch64";
archSuffix = arch;
url = "${baseUrl}/${version}/mac/${arch}/LibreOffice_${version}_MacOS_${archSuffix}.dmg";
url = "https://download.documentfoundation.org/libreoffice/stable/${version}/mac/${arch}/LibreOffice_${version}_MacOS_${archSuffix}.dmg";
sha256 = "50ed3deb8d9c987516e2687ebb865bca15486c69da79f1b6d74381e43f2ec863";
};
x86_64-darwin = rec {
arch = "x86_64";
archSuffix = "x86-64";
url = "${baseUrl}/${version}/mac/${arch}/LibreOffice_${version}_MacOS_${archSuffix}.dmg";
url = "https://download.documentfoundation.org/libreoffice/stable/${version}/mac/${arch}/LibreOffice_${version}_MacOS_${archSuffix}.dmg";
sha256 = "fb2f9bb90eee34a22af3a2bf2854ef5b76098302b3c41d13d4f543f0d72b994f";
};
};
@ -63,9 +62,7 @@ stdenvNoCC.mkDerivation {
''
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p common-updater-scripts
set -o errexit
set -o nounset
set -o pipefail
set -eou pipefail
# reset version first so that both platforms are always updated and in sync
update-source-version libreoffice 0 ${nullHash} --system=aarch64-darwin