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

Merge pull request #117557 from happysalada/wrangler_fix_darwin_build

Browse Source 
wrangler: fix darwin build
This commit is contained in:
Sandro 2021-03-25 09:31:22 +01:00 committed by GitHub
commit bf43a10261
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, curl, Security, CoreServices, CoreFoundation }:
{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, curl, Security, CoreServices, CoreFoundation, libiconv }:
rustPlatform.buildRustPackage rec {
pname = "wrangler";
@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ]
++ lib.optionals stdenv.isDarwin [ curl CoreFoundation CoreServices Security ];
++ lib.optionals stdenv.isDarwin [ curl CoreFoundation CoreServices Security libiconv ];
OPENSSL_NO_VENDOR = 1;

1
pkgs/top-level/all-packages.nix
View File

@ -4035,6 +4035,7 @@ in
wrangler = callPackage ../development/tools/wrangler {
inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Security;
inherit (darwin) libiconv;
};
wsl-open = callPackage ../tools/misc/wsl-open { };