From 3a53307dd9f12e781acb5306bed69d364c2ad812 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Wed, 15 Feb 2023 21:08:19 +0000
Subject: graalvmCEPackages.buildGraalvmProduct: link languages .so to $out/lib

---
 .../graalvm/community-edition/buildGraalvmProduct.nix         | 11 +++++++++++
 .../graalvm/community-edition/llvm-installable-svm.nix        |  4 ----
 2 files changed, 11 insertions(+), 4 deletions(-)

(limited to 'pkgs/development/compilers/graalvm')

diff --git a/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix b/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix
index aad60e13d308c..6037435d3aec4 100644
--- a/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix
+++ b/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix
@@ -74,6 +74,17 @@ stdenv.mkDerivation ({
     runHook postUnpack
   '';
 
+  # Allow autoPatchelf to automatically fix lib references between products
+  fixupPhase = ''
+    runHook preFixup
+
+    mkdir -p $out/lib
+    shopt -s globstar
+    ln -s $out/languages/**/lib/*.so $out/lib
+
+    runHook postFixup
+  '';
+
   dontInstall = true;
   dontBuild = true;
   dontStrip = true;
diff --git a/pkgs/development/compilers/graalvm/community-edition/llvm-installable-svm.nix b/pkgs/development/compilers/graalvm/community-edition/llvm-installable-svm.nix
index 96b9ee9635a5a..9fc8fb3db95ed 100644
--- a/pkgs/development/compilers/graalvm/community-edition/llvm-installable-svm.nix
+++ b/pkgs/development/compilers/graalvm/community-edition/llvm-installable-svm.nix
@@ -10,10 +10,6 @@ graalvmCEPackages.buildGraalvmProduct rec {
   inherit src javaVersion version;
   product = "llvm-installable-svm";
 
-  postUnpack = ''
-    ln -s $out/languages/llvm/native/lib/*.so $out/lib
-  '';
-
   # TODO: improve this test
   graalvmPhases.installCheckPhase = ''
     echo "Testing llvm"
-- 
cgit 1.4.1