summary refs log tree commit diff
path: root/pkgs/build-support
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2021-12-28 12:01:23 +0000
committerGitHub <noreply@github.com>2021-12-28 12:01:23 +0000
commit2e759d4fd076ad61a6805d4079af85062288be71 (patch)
tree1484848e15487671791678bbcbf9134502d69416 /pkgs/build-support
parent996c3bdfc2d588d89ef28aff3956e7ea189918ed (diff)
parentd8807d2e2cd92c13f8b75a72f2d3143f65cc6812 (diff)
downloadnixpkgs-2e759d4fd076ad61a6805d4079af85062288be71.tar
nixpkgs-2e759d4fd076ad61a6805d4079af85062288be71.tar.gz
nixpkgs-2e759d4fd076ad61a6805d4079af85062288be71.tar.bz2
nixpkgs-2e759d4fd076ad61a6805d4079af85062288be71.tar.lz
nixpkgs-2e759d4fd076ad61a6805d4079af85062288be71.tar.xz
nixpkgs-2e759d4fd076ad61a6805d4079af85062288be71.tar.zst
nixpkgs-2e759d4fd076ad61a6805d4079af85062288be71.zip
Merge master into staging-next
Diffstat (limited to 'pkgs/build-support')
-rw-r--r--pkgs/build-support/build-graalvm-native-image/default.nix9
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/build-support/build-graalvm-native-image/default.nix b/pkgs/build-support/build-graalvm-native-image/default.nix
index 0ed8ea0486b..09b2d9f73a2 100644
--- a/pkgs/build-support/build-graalvm-native-image/default.nix
+++ b/pkgs/build-support/build-graalvm-native-image/default.nix
@@ -21,6 +21,7 @@
 , graalvmXmx ? "-J-Xmx6g"
   # The GraalVM to use
 , graalvm ? graalvmCEPackages.graalvm11-ce
+, meta ? { }
 , ...
 } @ args:
 
@@ -47,6 +48,10 @@ stdenv.mkDerivation (args // {
     runHook postInstall
   '';
 
-  meta.platforms = lib.attrByPath [ "meta" "platforms" ] graalvm.meta.platforms args;
-  meta.mainProgram = lib.attrByPath [ "meta" "mainProgram" ] executable args;
+  meta = {
+    # default to graalvm's platforms
+    platforms = graalvm.meta.platforms;
+    # default to executable name
+    mainProgram = executable;
+  } // meta;
 })