MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 14:54:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

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

@ -24277,7 +24277,9 @@ in
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 { };