From 6704d4f4e4d2af442a4b76a6011f660fb115eb91 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Sat, 11 Feb 2023 14:03:22 +0000 Subject: [PATCH] bbin: inherit graalvmDrv from babashka --- pkgs/build-support/build-graalvm-native-image/default.nix | 2 ++ pkgs/development/tools/bbin/default.nix | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/build-graalvm-native-image/default.nix b/pkgs/build-support/build-graalvm-native-image/default.nix index 019055332024..be11d06308a7 100644 --- a/pkgs/build-support/build-graalvm-native-image/default.nix +++ b/pkgs/build-support/build-graalvm-native-image/default.nix @@ -51,6 +51,8 @@ stdenv.mkDerivation (args // { disallowedReferences = [ graalvmDrv ]; + passthru = { inherit graalvmDrv; }; + meta = { # default to graalvm's platforms platforms = graalvmDrv.meta.platforms; diff --git a/pkgs/development/tools/bbin/default.nix b/pkgs/development/tools/bbin/default.nix index 606633fd3a1a..d0956845092f 100644 --- a/pkgs/development/tools/bbin/default.nix +++ b/pkgs/development/tools/bbin/default.nix @@ -29,7 +29,7 @@ stdenvNoCC.mkDerivation rec { mkdir -p $out/share cp -r docs $out/share/docs wrapProgram $out/bin/bbin \ - --prefix PATH : "${lib.makeBinPath [ babashka graalvm17-ce ]}" + --prefix PATH : "${lib.makeBinPath [ babashka babashka.graalvmDrv ]}" runHook postInstall '';