git.iko.soy/typeable/nixpkgs
on master help sign in
adjusted jre_headless references
commit989661d13e44234e43d36c41a9944f563f8ae04e authorChris Connelly <github@logon.pw> dateSun 31 Jan 2021, 19:14 (6 years ago) parentf8b0db1
1 file changed+4−4
pkgs/applications/networking/instant-messengers/signal-cli/default.nix+4−4
pkgs/applications/networking/instant-messengers/signal-cli/default.nix+4−4
@@ -18,15 +18,15 @@ stdenv.mkDerivation rec {
1818 cp -r lib $out/lib
1919 cp bin/signal-cli $out/bin/signal-cli
2020 '' + (if stdenv.isLinux then ''
21− makeWrapper ${jre_headless}/bin/java $out/bin/signal-cli \
22− --set JAVA_HOME "${jre_headless}" \
21+ makeWrapper ${openjdk11_headless}/bin/java $out/bin/signal-cli \
22+ --set JAVA_HOME "${openjdk11_headless}" \
2323 --add-flags "-classpath '$out/lib/*:${libmatthew_java}/lib/jni'" \
2424 --add-flags "-Djava.library.path=${libmatthew_java}/lib/jni:${dbus_java}/share/java/dbus:$out/lib" \
2525 --add-flags "org.asamk.signal.Main"
2626 '' else ''
2727 wrapProgram $out/bin/signal-cli \
28− --prefix PATH : ${lib.makeBinPath [ jre_headless ]} \
29− --set JAVA_HOME ${jre_headless}
28+ --prefix PATH : ${lib.makeBinPath [ openjdk11_headless ]} \
29+ --set JAVA_HOME ${openjdk11_headless}
3030 '');
3131
3232 # Execution in the macOS (10.13) sandbox fails with