b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

tarmac: update Cargo.lock and unpin openssl

Browse source
This commit is contained in:
figsoda 2023-05-12 21:54:36 -04:00
parent 1e5e280dec
commit 28f552faf5
2 changed files with 2224 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2212
pkgs/development/tools/tarmac/Cargo.lock generated Normal file
View file

File diff suppressed because it is too large Load diff

17
pkgs/development/tools/tarmac/default.nix
View file

@ -1,9 +1,9 @@
{ lib { lib
, stdenv
, fetchFromGitHub
, rustPlatform , rustPlatform
, fetchFromGitHub
, pkg-config , pkg-config
, openssl_1_1 , openssl
, stdenv
, Security , Security
}: }:
@ -18,18 +18,25 @@ rustPlatform.buildRustPackage rec {
sha256 = "sha256-O6qrAzGiAxiE56kpuvH/jDKHRXxHZ2SlDL5nwOOd4EU="; sha256 = "sha256-O6qrAzGiAxiE56kpuvH/jDKHRXxHZ2SlDL5nwOOd4EU=";
}; };
cargoSha256 = "sha256-QnpowYv/TBXjPHK8z6KAzN3gSsfNOf9POybqsyugeWc="; cargoLock = {
lockFile = ./Cargo.lock;
};
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config
]; ];
buildInputs = [ buildInputs = [
openssl_1_1 openssl
] ++ lib.optionals stdenv.isDarwin [ ] ++ lib.optionals stdenv.isDarwin [
Security Security
]; ];
# update Cargo.lock to work with openssl 3
postPatch = ''
ln -sf ${./Cargo.lock} Cargo.lock
'';
meta = with lib; { meta = with lib; {
description = "Resource compiler and asset manager for Roblox"; description = "Resource compiler and asset manager for Roblox";
longDescription = '' longDescription = ''