706cdcf · typeable/nixpkgs

git.iko.soy/typeable/nixpkgs

on master help sign in

deno: fix darwin build

706cdcfStéphan Kochen5 years ago

pkgs/development/web/deno/default.nix+3−1

@@ -11,6 +11,7 @@

11, CoreServices

12, Metal

13, Foundation

14+, QuartzCore

14, librusty_v8 ? callPackage ./librusty_v8.nix { }

15, librusty_v8 ? callPackage ./librusty_v8.nix { }

15}:

16}:

@@ -31,7 +32,8 @@ rustPlatform.buildRustPackage rec {

32 buildAndTestSubdir = "cli";

33 buildAndTestSubdir = "cli";

35+ buildInputs = lib.optionals stdenv.isDarwin

34− buildInputs = lib.optionals stdenv.isDarwin [ libiconv libobjc Security CoreServices Metal Foundation ];

36+ [ libiconv libobjc Security CoreServices Metal Foundation QuartzCore ];

36 # The rusty_v8 package will try to download a `librusty_v8.a` release at build time to our read-only filesystem

38 # The rusty_v8 package will try to download a `librusty_v8.a` release at build time to our read-only filesystem

37 # To avoid this we pre-download the file and place it in the locations it will require it in advance

39 # To avoid this we pre-download the file and place it in the locations it will require it in advance

pkgs/top-level/all-packages.nix+2−1

@@ -3875,7 +3875,8 @@ in

3875

3876 deno = callPackage ../development/web/deno {

3877 inherit (darwin) libobjc;

3878− inherit (darwin.apple_sdk.frameworks) Security CoreServices Metal Foundation;

3878+ inherit (darwin.apple_sdk.frameworks)

3879+ Security CoreServices Metal Foundation QuartzCore;

3879 };

3880 };

3880

3881

3881 detox = callPackage ../tools/misc/detox { };

3882 detox = callPackage ../tools/misc/detox { };