Unverified Commit d6b7d2ba authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #238931 from wegank/wasmedge-darwin 

wasmedge: fix build on x86_64-darwin
parents fc344248 c705bcba

pkgs/development/tools/wasmedge/default.nix

+3 −3
Original line number Diff line number Diff line 
{ lib

, fetchFromGitHub

, llvmPackages

, llvmPackages_12

, boost

, cmake

, spdlog
@@ -11,6 +11,7 @@ 
}:



let

  llvmPackages = llvmPackages_12;

  stdenv = llvmPackages.stdenv;

in

stdenv.mkDerivation (finalAttrs: {
@@ -61,7 +62,6 @@ stdenv.mkDerivation (finalAttrs: { 
    license = with licenses; [ asl20 ];

    description = "A lightweight, high-performance, and extensible WebAssembly runtime for cloud native, edge, and decentralized applications";

    maintainers = with maintainers; [ dit7ya ];

    # error: no member named 'utimensat' in the global namespace

    broken = stdenv.isDarwin && stdenv.isx86_64;

    platforms = platforms.all;

  };

})

pkgs/top-level/all-packages.nix

+2 −3
Original line number Diff line number Diff line
@@ -13803,9 +13803,8 @@ with pkgs; 














  wasm-tools = callPackage ../tools/misc/wasm-tools { };



























  wasmedge = callPackage ../development/tools/wasmedge {













    llvmPackages = llvmPackages_12;













    inherit (darwin.apple_sdk.frameworks) Foundation;













  wasmedge = darwin.apple_sdk_11_0.callPackage ../development/tools/wasmedge {













    inherit (darwin.apple_sdk_11_0.frameworks) Foundation;















  };





























  welkin = callPackage ../tools/graphics/welkin { };