nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-22 08:30:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

buildGraalvm: do not add products inputs

Browse Source
This commit is contained in:
Thiago Kenji Okada
2023-02-09 23:41:40 +00:00
parent 0b6052b8b0
commit 1da6843f1b
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix
View File

@@ -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 = ''