diff options
| author | Chris Connelly <github@logon.pw> | 2021-01-31 19:14:34 -0500 |
|---|---|---|
| committer | Chris Connelly <github@logon.pw> | 2021-01-31 19:14:34 -0500 |
| commit | 989661d13e44234e43d36c41a9944f563f8ae04e (patch) | |
| tree | cde74f4ae2a78ee2ddb90c576f1225e6e5a49926 | |
| parent | f8b0db1cfac86fb5d5eccc1dacc1a786f4fb9335 (diff) | |
| download | nixpkgs-989661d13e44234e43d36c41a9944f563f8ae04e.tar nixpkgs-989661d13e44234e43d36c41a9944f563f8ae04e.tar.gz nixpkgs-989661d13e44234e43d36c41a9944f563f8ae04e.tar.bz2 nixpkgs-989661d13e44234e43d36c41a9944f563f8ae04e.tar.lz nixpkgs-989661d13e44234e43d36c41a9944f563f8ae04e.tar.xz nixpkgs-989661d13e44234e43d36c41a9944f563f8ae04e.tar.zst nixpkgs-989661d13e44234e43d36c41a9944f563f8ae04e.zip | |
adjusted jre_headless references
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/signal-cli/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix index c68712c579b..601489d4532 100644 --- a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix @@ -18,15 +18,15 @@ stdenv.mkDerivation rec { cp -r lib $out/lib cp bin/signal-cli $out/bin/signal-cli '' + (if stdenv.isLinux then '' - makeWrapper ${jre_headless}/bin/java $out/bin/signal-cli \ - --set JAVA_HOME "${jre_headless}" \ + makeWrapper ${openjdk11_headless}/bin/java $out/bin/signal-cli \ + --set JAVA_HOME "${openjdk11_headless}" \ --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 "org.asamk.signal.Main" '' else '' wrapProgram $out/bin/signal-cli \ - --prefix PATH : ${lib.makeBinPath [ jre_headless ]} \ - --set JAVA_HOME ${jre_headless} + --prefix PATH : ${lib.makeBinPath [ openjdk11_headless ]} \ + --set JAVA_HOME ${openjdk11_headless} ''); # Execution in the macOS (10.13) sandbox fails with |