colin
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #302837 from wegank/wasmedge-llvm 

wasmedge: unpin llvmPackages_12
This commit is contained in:
Weijia Wang 2024-04-17 00:17:54 +02:00 committed by GitHub
parent a51cddc999 ebf91c6fb5
commit d48c3e9410
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/tools/wasmedge/default.nix
View File

@ -1,6 +1,7 @@
{ 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";

3
pkgs/top-level/all-packages.nix
View File

@ -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;
};