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

Merge pull request #302837 from wegank/wasmedge-llvm 

wasmedge: unpin llvmPackages_12
parents a51cddc9 ebf91c6f

pkgs/development/tools/wasmedge/default.nix

+2 −5
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchFromGitHub

, llvmPackages_12

, llvmPackages

, boost

, cmake

, spdlog
@@ -10,10 +11,6 @@ 
, testers

}:



let

  llvmPackages = llvmPackages_12;

  stdenv = llvmPackages.stdenv;

in

stdenv.mkDerivation (finalAttrs: {

  pname = "wasmedge";

  version = "0.13.5";

pkgs/top-level/all-packages.nix

+2 −1
Original line number Diff line number Diff line
@@ -14385,7 +14385,8 @@ with pkgs; 














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



























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













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













    stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else llvmPackages.stdenv;















    inherit (darwin.apple_sdk_11_0.frameworks) Foundation;















  };