dbqn: remove top-level override (#483861)
This commit is contained in:
@@ -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
|
||||
};
|
||||
}
|
||||
|
||||
@@ -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 {
|
||||
|
||||
Reference in New Issue
Block a user