Merge pull request #139769 from 0x4A6F/master-zola

zola: aarch64-darwin support

authored by

figsoda and committed by
GitHub
c55963ce 005c60cb

+24 -4
+24 -4
pkgs/applications/misc/zola/default.nix
··· 1 - { lib, stdenv, fetchFromGitHub, rustPlatform, cmake, pkg-config, openssl, oniguruma, CoreServices, installShellFiles }: 2 3 rustPlatform.buildRustPackage rec { 4 pname = "zola"; ··· 13 14 cargoSha256 = "1hg8j9a8c6c3ap24jd96y07rlp4f0s2mkyx5034nlnkm3lj4q42n"; 15 16 - nativeBuildInputs = [ cmake pkg-config installShellFiles]; 17 - buildInputs = [ openssl oniguruma ] 18 - ++ lib.optional stdenv.isDarwin CoreServices; 19 20 RUSTONIG_SYSTEM_LIBONIG = true; 21
··· 1 + { lib 2 + , stdenv 3 + , fetchFromGitHub 4 + , rustPlatform 5 + , cmake 6 + , pkg-config 7 + , openssl 8 + , oniguruma 9 + , CoreServices 10 + , installShellFiles 11 + , libsass 12 + }: 13 14 rustPlatform.buildRustPackage rec { 15 pname = "zola"; ··· 24 25 cargoSha256 = "1hg8j9a8c6c3ap24jd96y07rlp4f0s2mkyx5034nlnkm3lj4q42n"; 26 27 + nativeBuildInputs = [ 28 + cmake 29 + pkg-config 30 + installShellFiles 31 + ]; 32 + buildInputs = [ 33 + openssl 34 + oniguruma 35 + ] ++ lib.optional stdenv.isDarwin [ 36 + CoreServices 37 + libsass 38 + ]; 39 40 RUSTONIG_SYSTEM_LIBONIG = true; 41