diff options
| -rw-r--r-- | nixos/modules/services/databases/foundationdb.xml | 1 | ||||
| -rw-r--r-- | pkgs/servers/foundationdb/default.nix | 8 |
2 files changed, 6 insertions, 3 deletions
diff --git a/nixos/modules/services/databases/foundationdb.xml b/nixos/modules/services/databases/foundationdb.xml index 2a0e3c76c9d8..0a96203e0551 100644 --- a/nixos/modules/services/databases/foundationdb.xml +++ b/nixos/modules/services/databases/foundationdb.xml @@ -254,7 +254,6 @@ only undergone fairly basic testing of all the available functionality.</para> </para></listitem> <listitem><para>Python bindings are not currently installed.</para></listitem> <listitem><para>Ruby bindings are not currently installed.</para></listitem> - <listitem><para>Java bindings are not currently installed.</para></listitem> <listitem><para>Go bindings are not currently installed.</para></listitem> </itemizedlist> diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix index 95326b4c1c6c..3397c2ba386e 100644 --- a/pkgs/servers/foundationdb/default.nix +++ b/pkgs/servers/foundationdb/default.nix @@ -64,18 +64,22 @@ in stdenv.mkDerivation rec { ''; enableParallelBuilding = true; - makeFlags = [ "all" "fdb_c" "KVRELEASE=1" ]; + makeFlags = [ "all" "fdb_c" "fdb_java" "KVRELEASE=1" ]; configurePhase = ":"; installPhase = '' - mkdir -vp $out/{bin,libexec/plugins} $lib/lib $dev/include/foundationdb + mkdir -vp $out/{bin,libexec/plugins} $lib/{lib,share/java} $dev/include/foundationdb cp -v ./lib/libfdb_c.so $lib/lib + cp -v ./lib/libfdb_java.so $lib/lib + cp -v ./lib/libFDBLibTLS.so $out/libexec/plugins/FDBLibTLS.so cp -v ./bindings/c/foundationdb/fdb_c.h $dev/include/foundationdb cp -v ./bindings/c/foundationdb/fdb_c_options.g.h $dev/include/foundationdb + cp -v ./bindings/java/foundationdb-client.jar $lib/share/java + for x in fdbbackup fdbcli fdbserver fdbmonitor; do cp -v "./bin/$x" $out/bin; done |