summary refs log tree commit diff
path: root/pkgs/development/interpreters/bqn
diff options
context:
space:
mode:
authorsterni <sternenseemann@systemli.org>2021-10-06 21:05:17 +0200
committerGitHub <noreply@github.com>2021-10-06 16:05:17 -0300
commit2924140fac5b61f56e040b350fa3396a0e0918e3 (patch)
tree64a1f136f531c238dcbf3566b5be056869b6ee84 /pkgs/development/interpreters/bqn
parentfc89e2a3c61ad70551daf6bb5dc2a5d7aeb5c9cb (diff)
downloadnixpkgs-2924140fac5b61f56e040b350fa3396a0e0918e3.tar
nixpkgs-2924140fac5b61f56e040b350fa3396a0e0918e3.tar.gz
nixpkgs-2924140fac5b61f56e040b350fa3396a0e0918e3.tar.bz2
nixpkgs-2924140fac5b61f56e040b350fa3396a0e0918e3.tar.lz
nixpkgs-2924140fac5b61f56e040b350fa3396a0e0918e3.tar.xz
nixpkgs-2924140fac5b61f56e040b350fa3396a0e0918e3.tar.zst
nixpkgs-2924140fac5b61f56e040b350fa3396a0e0918e3.zip
dbqn, dbqn-native: 2021-10-02 -> 2021-10-05 (#140601)
Summary:

- This new release internalizes the old, explicit log into `./build{,8}` scripts.
- Reduces closure size, by explicitly passing JDK(GraalVM) library output to native-image flags.
- Moves JDK to native build inputs.
- Resets meta.priority to default, since it is explicitly differentiated by pname.
Diffstat (limited to 'pkgs/development/interpreters/bqn')
-rw-r--r--pkgs/development/interpreters/bqn/dzaima-bqn/default.nix19
1 files changed, 8 insertions, 11 deletions
diff --git a/pkgs/development/interpreters/bqn/dzaima-bqn/default.nix b/pkgs/development/interpreters/bqn/dzaima-bqn/default.nix
index 6c4022ed025..4d5568667fe 100644
--- a/pkgs/development/interpreters/bqn/dzaima-bqn/default.nix
+++ b/pkgs/development/interpreters/bqn/dzaima-bqn/default.nix
@@ -8,32 +8,30 @@
 
 stdenv.mkDerivation rec {
   pname = "dbqn" + lib.optionalString buildNativeImage "-native";
-  version = "0.0.0+unstable=2021-10-02";
+  version = "0.0.0+unstable=2021-10-05";
 
   src = fetchFromGitHub {
     owner = "dzaima";
     repo = "BQN";
-    rev = "d6bd66d26a89b8e9f956ec4f6b6bc5dcb5861a09";
-    hash = "sha256-BLRep7OGHfDFowIAsBS19PTzgIhrdKMnO2JSjKuwGYo=";
+    rev = "c31ceef52bbf380e747723f5ffd09c5f006b21c5";
+    sha256 = "1nzqgwpjawcky85mfrz5izs9lfb3aqlm96dc8syrxhgg20xrziwx";
   };
 
-  buildInputs = lib.optional (!buildNativeImage) jdk;
-
   nativeBuildInputs = [
     makeWrapper
-  ] ++ lib.optional buildNativeImage jdk;
+    jdk
+  ];
 
   dontConfigure = true;
 
   buildPhase = ''
     runHook preBuild
 
-    mkdir -p output
-    javac --release 8 -encoding UTF-8 -d ./output $(find src -name '*.java')
-    (cd output; jar cvfe ../BQN.jar BQN.Main *)
-    rm -fr output
+    patchShebangs --build ./build8
+    ./build8
   '' + lib.optionalString buildNativeImage ''
     native-image --report-unsupported-elements-at-runtime \
+      -H:CLibraryPath=${lib.getLib jdk}/lib \
       -J-Dfile.encoding=UTF-8 -jar BQN.jar dbqn
   '' + ''
     runHook postBuild
@@ -64,7 +62,6 @@ stdenv.mkDerivation rec {
     license = licenses.mit;
     maintainers = with maintainers; [ AndersonTorres sternenseemann ];
     inherit (jdk.meta) platforms;
-    priority = if buildNativeImage then 10 else 0;
   };
 }
 # TODO: Processing app