public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

adjusted jre_headless references

Browse Source
This commit is contained in:
Chris Connelly 2021-01-31 19:14:34 -05:00
parent f8b0db1cfa
commit 989661d13e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/networking/instant-messengers/signal-cli/default.nix
View File

@ -18,15 +18,15 @@ stdenv.mkDerivation rec {
cp -r lib $out/lib cp -r lib $out/lib
cp bin/signal-cli $out/bin/signal-cli cp bin/signal-cli $out/bin/signal-cli
'' + (if stdenv.isLinux then '' '' + (if stdenv.isLinux then ''
makeWrapper ${jre_headless}/bin/java $out/bin/signal-cli \ makeWrapper ${openjdk11_headless}/bin/java $out/bin/signal-cli \
--set JAVA_HOME "${jre_headless}" \ --set JAVA_HOME "${openjdk11_headless}" \
--add-flags "-classpath '$out/lib/*:${libmatthew_java}/lib/jni'" \ --add-flags "-classpath '$out/lib/*:${libmatthew_java}/lib/jni'" \
--add-flags "-Djava.library.path=${libmatthew_java}/lib/jni:${dbus_java}/share/java/dbus:$out/lib" \ --add-flags "-Djava.library.path=${libmatthew_java}/lib/jni:${dbus_java}/share/java/dbus:$out/lib" \
--add-flags "org.asamk.signal.Main" --add-flags "org.asamk.signal.Main"
'' else '' '' else ''
wrapProgram $out/bin/signal-cli \ wrapProgram $out/bin/signal-cli \
--prefix PATH : ${lib.makeBinPath [ jre_headless ]} \ --prefix PATH : ${lib.makeBinPath [ openjdk11_headless ]} \
--set JAVA_HOME ${jre_headless} --set JAVA_HOME ${openjdk11_headless}
''); '');
# Execution in the macOS (10.13) sandbox fails with # Execution in the macOS (10.13) sandbox fails with