summary refs log tree commit diff
diff options
context:
space:
mode:
authorStig Palmquist <stig@stig.io>2022-04-06 00:44:55 +0200
committerStig Palmquist <stig@stig.io>2022-04-06 00:44:55 +0200
commitdb0a2f538e2ac85544b65fa8658437779f123361 (patch)
treef05a5afbbb0c7f6ebf0be7ca033554c68fcb68db
parent38b516e1448f8c3e18c1c5d07389ec44d2a5beae (diff)
downloadnixpkgs-db0a2f538e2ac85544b65fa8658437779f123361.tar
nixpkgs-db0a2f538e2ac85544b65fa8658437779f123361.tar.gz
nixpkgs-db0a2f538e2ac85544b65fa8658437779f123361.tar.bz2
nixpkgs-db0a2f538e2ac85544b65fa8658437779f123361.tar.lz
nixpkgs-db0a2f538e2ac85544b65fa8658437779f123361.tar.xz
nixpkgs-db0a2f538e2ac85544b65fa8658437779f123361.tar.zst
nixpkgs-db0a2f538e2ac85544b65fa8658437779f123361.zip
nqp: 2022.02 -> 2022.03
-rw-r--r--pkgs/development/interpreters/rakudo/nqp.nix14
1 files changed, 12 insertions, 2 deletions
diff --git a/pkgs/development/interpreters/rakudo/nqp.nix b/pkgs/development/interpreters/rakudo/nqp.nix
index 57cdef94c02..dbcb945f4c3 100644
--- a/pkgs/development/interpreters/rakudo/nqp.nix
+++ b/pkgs/development/interpreters/rakudo/nqp.nix
@@ -2,16 +2,26 @@
 
 stdenv.mkDerivation rec {
   pname = "nqp";
-  version = "2022.02";
+  version = "2022.03";
 
   src = fetchurl {
     url = "https://github.com/raku/nqp/releases/download/${version}/nqp-${version}.tar.gz";
-    sha256 = "sha256-JdPJl0XNhPQEmpvZzya7XcgXklq6r+ccm9tohBzbGLE=";
+    sha256 = "sha256-qV53iXDE0JwJHSqimcBQNiCM5LSw06evNzGYwSJYswY=";
   };
 
   buildInputs = [ perl ];
 
   configureScript = "${perl}/bin/perl ./Configure.pl";
+
+  # Fix for issue where nqp expects to find files from moarvm in the same output:
+  # https://github.com/Raku/nqp/commit/e6e069507de135cc71f77524455fc6b03b765b2f
+  #
+  preBuild = ''
+    share_dir="share/nqp/lib/MAST"
+    mkdir -p $out/$share_dir
+    ln -fs ${moarvm}/$share_dir/{Nodes,Ops}.nqp $out/$share_dir
+  '';
+
   configureFlags = [
     "--backends=moar"
     "--with-moar=${moarvm}/bin/moar"