From 7d56d31d822967dbd9d082889d2666cf81f1426c Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Thu, 19 May 2022 23:27:32 +0100 Subject: [PATCH] moarvm: add patch fixing build of bundled mimalloc on darwin same patch as introduced to our own mimalloc in 9ba8bda31328209bed6d4c0212735ff0e3c2cf95 --- pkgs/development/interpreters/rakudo/moarvm.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/development/interpreters/rakudo/moarvm.nix b/pkgs/development/interpreters/rakudo/moarvm.nix index 08c225603eb..da7e66efff1 100644 --- a/pkgs/development/interpreters/rakudo/moarvm.nix +++ b/pkgs/development/interpreters/rakudo/moarvm.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , perl , CoreServices , ApplicationServices @@ -15,6 +16,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-+3HNE5EkZEgrmbM/DAbp/XxRoVHG5jKpIgz5PFhV/a8="; }; + patches = [ + (fetchpatch { + name = "mimalloc-older-macos-fixes.patch"; + url = "https://github.com/microsoft/mimalloc/commit/40e0507a5959ee218f308d33aec212c3ebeef3bb.patch"; + stripLen = 1; + extraPrefix = "3rdparty/mimalloc/"; + sha256 = "1gcbn1850vy7xzalhn9ffnsg6x1ywi3fmnxvnal3m6lmb4kz5kb1"; + }) + ]; + postPatch = '' patchShebangs . '' + lib.optionalString stdenv.isDarwin ''