mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-10-01 10:07:42 +03:00
libreoffice: pass explicit file to update-source-version function and
fix import typo
This commit is contained in:
parent
8315cf274b
commit
56ce01eca3
@ -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
|
||||
'';
|
||||
}
|
||||
|
@ -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; }))
|
||||
|
Loading…
Reference in New Issue
Block a user