summary refs log tree commit diff
path: root/pkgs/applications/science
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2021-02-27 12:20:00 +0000
committerGitHub <noreply@github.com>2021-02-27 12:20:00 +0000
commit2a38839b78d1a3f4cb269c2359f2ad384056f2a0 (patch)
tree5fe2b9610a8b810fca84162955ddf9b88499bede /pkgs/applications/science
parent2e1a7b94f3c85c982da8cd659e7a8d563fd3cbc0 (diff)
parent5b68a8b74bc3d82373a4e2b7c672e7bab57c9ee3 (diff)
downloadnixpkgs-2a38839b78d1a3f4cb269c2359f2ad384056f2a0.tar
nixpkgs-2a38839b78d1a3f4cb269c2359f2ad384056f2a0.tar.gz
nixpkgs-2a38839b78d1a3f4cb269c2359f2ad384056f2a0.tar.bz2
nixpkgs-2a38839b78d1a3f4cb269c2359f2ad384056f2a0.tar.lz
nixpkgs-2a38839b78d1a3f4cb269c2359f2ad384056f2a0.tar.xz
nixpkgs-2a38839b78d1a3f4cb269c2359f2ad384056f2a0.tar.zst
nixpkgs-2a38839b78d1a3f4cb269c2359f2ad384056f2a0.zip
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/science')
-rw-r--r--pkgs/applications/science/logic/z3/default.nix5
1 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix
index cfef5960bd9..e482a071bb4 100644
--- a/pkgs/applications/science/logic/z3/default.nix
+++ b/pkgs/applications/science/logic/z3/default.nix
@@ -57,9 +57,14 @@ stdenv.mkDerivation rec {
     mkdir -p $python/lib
     mv $lib/lib/python* $python/lib/
     ln -sf $lib/lib/libz3${stdenv.hostPlatform.extensions.sharedLibrary} $python/${python.sitePackages}/z3/lib/libz3${stdenv.hostPlatform.extensions.sharedLibrary}
+  '' + optionalString javaBindings ''
+    mkdir -p $java/share/java
+    mv com.microsoft.z3.jar $java/share/java
+    moveToOutput "lib/libz3java.${stdenv.hostPlatform.extensions.sharedLibrary}" "$java"
   '';
 
   outputs = [ "out" "lib" "dev" "python" ]
+    ++ optional javaBindings "java"
     ++ optional ocamlBindings "ocaml";
 
   meta = with lib; {