diff options
| author | Thibault Gagnaux <tgagnaux@gmail.com> | 2022-05-27 16:55:53 +0200 |
|---|---|---|
| committer | Thibault Gagnaux <tgagnaux@gmail.com> | 2022-05-27 17:44:53 +0200 |
| commit | 56ce01eca397ece27f5073f7eee3e637e90b4d2a (patch) | |
| tree | 841c4b5f54ddfd0ca74ac2d1b949b8345479230c /pkgs/applications/office | |
| parent | 8315cf274bf02124dbdea8106d6cd7ccefbd9484 (diff) | |
libreoffice: pass explicit file to update-source-version function and
fix import typo
Diffstat (limited to 'pkgs/applications/office')
| -rw-r--r-- | pkgs/applications/office/libreoffice/darwin/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/applications/office/libreoffice/default.nix | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/office/libreoffice/darwin/default.nix b/pkgs/applications/office/libreoffice/darwin/default.nix index 47b702cc29d4f..d1a47d4679119 100644 --- a/pkgs/applications/office/libreoffice/darwin/default.nix +++ b/pkgs/applications/office/libreoffice/darwin/default.nix @@ -69,9 +69,9 @@ 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 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 ''; } diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 2e781936c7aca..978c2da26a784 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -581,5 +581,5 @@ in requiredSystemFeatures = [ "big-parallel" ]; - inherit (import ../common.nix { inherit lib; }) meta; + inherit (import ./common.nix { inherit lib; }) meta; }).overrideAttrs ((importVariant "override.nix") (args // { inherit kdeIntegration; })) |