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

Merge pull request #66308 from marsam/fix-wasm-pack-darwin

Browse Source 
wasm-pack: fix build on darwin
This commit is contained in:
Mario Rodas 2019-08-08 07:55:55 -05:00 committed by GitHub
commit 26663f75a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/tools/wasm-pack/default.nix
View File

@ -3,6 +3,8 @@
, rustPlatform , rustPlatform
, pkgconfig , pkgconfig
, openssl , openssl
, curl
, Security
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
@ -20,7 +22,9 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ openssl ]; buildInputs = [ openssl ]
++ stdenv.lib.optionals stdenv.isDarwin [ curl Security ];
# Tests fetch external resources and build artifacts. # Tests fetch external resources and build artifacts.
# Disabled to work with sandboxing # Disabled to work with sandboxing

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

@ -24277,7 +24277,9 @@ in
vttest = callPackage ../tools/misc/vttest { }; vttest = callPackage ../tools/misc/vttest { };
wasm-pack = callPackage ../development/tools/wasm-pack { }; wasm-pack = callPackage ../development/tools/wasm-pack {
inherit (darwin.apple_sdk.frameworks) Security;
};
wavegain = callPackage ../applications/audio/wavegain { }; wavegain = callPackage ../applications/audio/wavegain { };