From 3a4be8aa4b6232c8393c2eb1f7d217b3d39317c5 Mon Sep 17 00:00:00 2001 From: tianyaochou Date: Sun, 19 Nov 2023 23:57:21 +0100 Subject: [PATCH] moarvm: fix build failure on x86_64-darwin --- pkgs/development/interpreters/rakudo/moarvm.nix | 5 +++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 6 insertions(+) diff --git a/pkgs/development/interpreters/rakudo/moarvm.nix b/pkgs/development/interpreters/rakudo/moarvm.nix index 041ac00b2c3a..3f1a9211bc91 100644 --- a/pkgs/development/interpreters/rakudo/moarvm.nix +++ b/pkgs/development/interpreters/rakudo/moarvm.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, cctools-port , perl , CoreServices , ApplicationServices @@ -29,6 +30,10 @@ stdenv.mkDerivation rec { --replace '`sw_vers -productVersion`' '"$MACOSX_DEPLOYMENT_TARGET"' ''; + nativeBuildInputs = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + cctools-port + ]; + buildInputs = [ perl ] ++ lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ]; doCheck = false; # MoarVM does not come with its own test suite diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6934627702a0..6b1bda03402a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17970,6 +17970,7 @@ with pkgs; rakudo = callPackage ../development/interpreters/rakudo { }; moarvm = callPackage ../development/interpreters/rakudo/moarvm.nix { + inherit (darwin) cctools-port; inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; }; nqp = callPackage ../development/interpreters/rakudo/nqp.nix { };