ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-01 18:17:21 +03:00
Code Issues Projects Releases Wiki Activity

libreoffice: pass explicit file to update-source-version function and

Browse Source 
fix import typo
This commit is contained in:
Thibault Gagnaux 2022-05-27 16:55:53 +02:00
parent 8315cf274b
commit 56ce01eca3
No known key found for this signature in database
GPG Key ID: 44BD0764ACAE8E25
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/office/libreoffice/darwin/default.nix
View File

@ -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
'';
}

2
pkgs/applications/office/libreoffice/default.nix
View File

@ -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; }))