From c705bcbafa5c21194c40c09214568bbddd7208d5 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 21 Jun 2023 14:51:04 +0300 Subject: [PATCH] wasmedge: fix build on x86_64-darwin --- pkgs/development/tools/wasmedge/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/wasmedge/default.nix b/pkgs/development/tools/wasmedge/default.nix index 0c0e22bf1c79..d0ad7cf8a947 100644 --- a/pkgs/development/tools/wasmedge/default.nix +++ b/pkgs/development/tools/wasmedge/default.nix @@ -1,6 +1,6 @@ { 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; }; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 790acf39453c..679f2d79a00a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13795,9 +13795,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 { };