From ebf91c6fb5ddba041ad04c5d03660da629f43491 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 9 Apr 2024 16:01:49 +0200 Subject: [PATCH] wasmedge: unpin llvmPackages_12 --- pkgs/development/tools/wasmedge/default.nix | 7 ++----- pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/wasmedge/default.nix b/pkgs/development/tools/wasmedge/default.nix index 7857b66c9183..4346b51efac8 100644 --- a/pkgs/development/tools/wasmedge/default.nix +++ b/pkgs/development/tools/wasmedge/default.nix @@ -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"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e55325e54f45..98e6f5134a57 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14398,7 +14398,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; };