From 1da6843f1b5b47ecc6857caafdeb025bd39a14f5 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Thu, 9 Feb 2023 23:41:40 +0000 Subject: [PATCH] buildGraalvm: do not add products inputs --- .../compilers/graalvm/community-edition/buildGraalvm.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix index 88ab5866dad3..c5b289f6f21c 100644 --- a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix +++ b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix @@ -24,7 +24,6 @@ let runtimeLibraryPath = lib.makeLibraryPath ([ cups ] ++ lib.optionals gtkSupport [ cairo glib gtk3 ]); mapProducts = key: default: (map (p: p.${key} or default) products); - mapProductsList = key: mapProducts key [ ]; concatProducts = key: lib.concatStringsSep "\n" (mapProducts key ""); graalvmXXX-ce = stdenv.mkDerivation (args // { @@ -69,12 +68,10 @@ let dontStrip = true; nativeBuildInputs = [ unzip makeWrapper ] - ++ lib.optional stdenv.isLinux autoPatchelfHook - ++ mapProductsList "nativeBuildInputs"; + ++ lib.optional stdenv.isLinux autoPatchelfHook; propagatedBuildInputs = [ setJavaClassPath zlib ] - ++ lib.optional stdenv.isDarwin Foundation - ++ mapProductsList "propagatedBuildInputs"; + ++ lib.optional stdenv.isDarwin Foundation; buildInputs = lib.optionals stdenv.isLinux [ alsa-lib # libasound.so wanted by lib/libjsound.so @@ -85,7 +82,7 @@ let xorg.libXi xorg.libXrender xorg.libXtst - ] ++ mapProductsList "buildInputs"; + ]; preInstall = concatProducts "preInstall"; postInstall = ''