From 023bdebe7756c19ae46cced7ff0d4b3feee0ab3a Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Thu, 3 Oct 2024 14:37:56 +0100 Subject: [PATCH] buildGraalvm: move files in $out to $out/share Like $out/LICENSE.txt since this is generally a bad idea and can cause conflicts with other packages. Fixes #345907. --- .../compilers/graalvm/community-edition/buildGraalvm.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix index 04f45c1ccddf..d360da5dfa6c 100644 --- a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix +++ b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix @@ -124,6 +124,12 @@ let # jni.h expects jni_md.h to be in the header search path. ln -sf $out/include/linux/*_md.h $out/include/ + mkdir -p $out/share + # move files in $out like LICENSE.txt + find $out/ -maxdepth 1 -type f -exec mv {} $out/share \; + # symbolic link to $out/lib/svm/LICENSE_NATIVEIMAGE.txt + rm -f $out/LICENSE_NATIVEIMAGE.txt + # copy-paste openjdk's preFixup # Set JAVA_HOME automatically. mkdir -p $out/nix-support