diff --git a/pkgs/by-name/db/dbqn/package.nix b/pkgs/by-name/db/dbqn/package.nix index cb7e6927ab109..00c5b8ecc31d0 100644 --- a/pkgs/by-name/db/dbqn/package.nix +++ b/pkgs/by-name/db/dbqn/package.nix @@ -1,13 +1,13 @@ { lib, - stdenv, + stdenvNoCC, fetchFromGitHub, - jdk, + jre, makeWrapper, buildNativeImage ? false, }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "dbqn" + lib.optionalString buildNativeImage "-native"; version = "0.2.2"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - jdk + jre makeWrapper ]; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { '' + lib.optionalString buildNativeImage '' native-image --report-unsupported-elements-at-runtime \ - -H:CLibraryPath=${lib.getLib jdk}/lib -J-Dfile.encoding=UTF-8 \ + -H:CLibraryPath=${lib.getLib jre}/lib -J-Dfile.encoding=UTF-8 \ -jar BQN.jar dbqn '' + '' @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { mkdir -p $out/share/dbqn mv BQN.jar $out/share/dbqn/ - makeWrapper "${lib.getBin jdk}/bin/java" "$out/bin/dbqn" \ + makeWrapper "${lib.getBin jre}/bin/java" "$out/bin/dbqn" \ --add-flags "-jar $out/share/dbqn/BQN.jar" '' ) @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ sternenseemann ]; - inherit (jdk.meta) platforms; - broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/dbqn-native.x86_64-darwin + inherit (jre.meta) platforms; + broken = stdenvNoCC.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/dbqn-native.x86_64-darwin }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 01921036db846..9f43537b7c1bd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5200,14 +5200,9 @@ with pkgs; }; }; - dbqn = callPackage ../by-name/db/dbqn/package.nix { - jdk = jre; - stdenv = stdenvNoCC; - }; - dbqn-native = dbqn.override { buildNativeImage = true; - jdk = graalvmPackages.graalvm-ce; + jre = graalvmPackages.graalvm-ce; }; clojupyter = callPackage ../applications/editors/jupyter-kernels/clojupyter {