diff --git a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix b/pkgs/development/compilers/graalvm/buildGraalvm.nix
similarity index 100%
rename from pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix
rename to pkgs/development/compilers/graalvm/buildGraalvm.nix
diff --git a/pkgs/development/compilers/graalvm/community-edition/default.nix b/pkgs/development/compilers/graalvm/community-edition/default.nix
index a29a81783c9cf..9277e7c7f0050 100644
--- a/pkgs/development/compilers/graalvm/community-edition/default.nix
+++ b/pkgs/development/compilers/graalvm/community-edition/default.nix
@@ -5,8 +5,6 @@
 }:
 
 {
-  buildGraalvm = callPackage ./buildGraalvm.nix;
-
   buildGraalvmProduct = callPackage ./buildGraalvmProduct.nix;
 
   graalvm-ce = callPackage ./graalvm-ce { };
diff --git a/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/default.nix b/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/default.nix
index b7f7db61097f2..da5b59417e20b 100644
--- a/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/default.nix
+++ b/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/default.nix
@@ -1,10 +1,10 @@
 { stdenv
 , fetchurl
-, graalvmCEPackages
+, graalvmPackages
 , useMusl ? false
 }:
 
-graalvmCEPackages.buildGraalvm {
+graalvmPackages.buildGraalvm {
   inherit useMusl;
   src = fetchurl (import ./hashes.nix).hashes.${stdenv.system};
   version = (import ./hashes.nix).version;
diff --git a/pkgs/development/compilers/graalvm/default.nix b/pkgs/development/compilers/graalvm/default.nix
new file mode 100644
index 0000000000000..b31c6251be718
--- /dev/null
+++ b/pkgs/development/compilers/graalvm/default.nix
@@ -0,0 +1,11 @@
+{ lib
+, stdenv
+, callPackage
+, fetchurl
+}:
+
+{
+
+  buildGraalvm = callPackage ./buildGraalvm.nix;
+
+}
diff --git a/pkgs/development/compilers/graalvm/oracle/default.nix b/pkgs/development/compilers/graalvm/oracle/default.nix
new file mode 100644
index 0000000000000..d82053c0748b9
--- /dev/null
+++ b/pkgs/development/compilers/graalvm/oracle/default.nix
@@ -0,0 +1,14 @@
+{ lib
+, stdenv
+, fetchurl
+, graalvmPackages
+, useMusl ? false
+}:
+
+graalvmPackages.buildGraalvm {
+  inherit useMusl;
+  src = fetchurl (import ./hashes.nix).hashes.${stdenv.system};
+  version = (import ./hashes.nix).version;
+  meta.platforms = builtins.attrNames (import ./hashes.nix).hashes;
+  meta.license = lib.licenses.unfree;
+}
diff --git a/pkgs/development/compilers/graalvm/oracle/hashes.nix b/pkgs/development/compilers/graalvm/oracle/hashes.nix
new file mode 100644
index 0000000000000..a4d383e129496
--- /dev/null
+++ b/pkgs/development/compilers/graalvm/oracle/hashes.nix
@@ -0,0 +1,21 @@
+{
+  "version" = "21";
+  "hashes" = {
+    "aarch64-linux" = {
+      sha256 = "eb1eaf9d1e1e01263b0acd552552686084903ae11a9a7698a144ef8c3ee02dec";
+      url = "https://download.oracle.com/graalvm/21/archive/graalvm-jdk-21_linux-aarch64_bin.tar.gz";
+    };
+    "x86_64-linux" = {
+      sha256 = "be1ab3c9b08b5747b7cd577c991d25b52157cff1c8c5f290f8556c593b57a6f4";
+      url = "https://download.oracle.com/graalvm/21/archive/graalvm-jdk-21_linux-x64_bin.tar.gz";
+    };
+    "x86_64-darwin" = {
+      sha256 = "0744ab104998f8f45d9ae582134963f5d273286dff9aff586aed24f5f8434660";
+      url = "https://download.oracle.com/graalvm/21/archive/graalvm-jdk-21_macos-x64_bin.tar.gz";
+    };
+    "aarch64-darwin" = {
+      sha256 = "c2ca434adef1e497c8a4d942ae1dbf6bbd1c8174a6fcdafc65cde0e853285300";
+      url = "https://download.oracle.com/graalvm/21/archive/graalvm-jdk-21_macos-aarch64_bin.tar.gz";
+    };
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7a590c236b410..2daaec05d9223 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16481,9 +16481,12 @@ with pkgs;
   openjdk = jdk;
   openjdk_headless = jdk_headless;
 
+  graalvmPackages =
+    recurseIntoAttrs (callPackage ../development/compilers/graalvm { });
   graalvmCEPackages =
     recurseIntoAttrs (callPackage ../development/compilers/graalvm/community-edition { });
   graalvm-ce = graalvmCEPackages.graalvm-ce;
+  graalvm-oracle = callPackage ../development/compilers/graalvm/oracle { };
   buildGraalvmNativeImage = (callPackage ../build-support/build-graalvm-native-image {
     graalvmDrv = graalvm-ce;
   }).override;