public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #115057 from danieldk/wrangler-system-openssl

Browse Source 
wrangler: build against system OpenSSL
This commit is contained in:
Sandro 2021-03-11 00:19:39 +01:00 committed by GitHub
commit bcf1cb0712
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/tools/wrangler/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, curl, Security, CoreServices, CoreFoundation, perl }: { lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, curl, Security, CoreServices, CoreFoundation }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "wrangler"; pname = "wrangler";
@ -13,12 +13,13 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "0w845virvw7mvibc76ar2hbffhfzj2v8v1xkrsssrgzyaryb48jk"; cargoSha256 = "0w845virvw7mvibc76ar2hbffhfzj2v8v1xkrsssrgzyaryb48jk";
nativeBuildInputs = [ perl ] nativeBuildInputs = [ pkg-config ];
++ lib.optionals stdenv.isLinux [ pkg-config ];
buildInputs = lib.optionals stdenv.isLinux [ openssl ] buildInputs = [ openssl ]
++ lib.optionals stdenv.isDarwin [ curl CoreFoundation CoreServices Security ]; ++ lib.optionals stdenv.isDarwin [ curl CoreFoundation CoreServices Security ];
OPENSSL_NO_VENDOR = 1;
# tries to use "/homeless-shelter" and fails # tries to use "/homeless-shelter" and fails
doCheck = false; doCheck = false;