diff options
| -rw-r--r-- | pkgs/applications/misc/jbidwatcher/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/applications/misc/jbidwatcher/default.nix b/pkgs/applications/misc/jbidwatcher/default.nix index 555c7e45d7b8..56c547ce4357 100644 --- a/pkgs/applications/misc/jbidwatcher/default.nix +++ b/pkgs/applications/misc/jbidwatcher/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre }: +{ stdenv, fetchurl, java }: stdenv.mkDerivation rec { pname = "jbidwatcher"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0nrs9ly56cqn33dm1sjm53pzj1cf7jncwn4c8v0xyva4jqyz2y5p"; }; - buildInputs = [ jre ]; + buildInputs = [ java ]; jarfile = "$out/share/java/${pname}/JBidwatcher.jar"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { installPhase = '' ensureDir "$out/bin" echo > "$out/bin/${pname}" "#!/bin/sh" - echo >>"$out/bin/${pname}" "${jre}/bin/java -Xmx512m -jar ${jarfile}" + echo >>"$out/bin/${pname}" "${java}/bin/java -Xmx512m -jar ${jarfile}" chmod +x "$out/bin/${pname}" install -D -m644 ${src} ${jarfile} ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a896aa07aa73..5c779134d0e9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6427,7 +6427,9 @@ let inherit (gnome) libglade; }; - jbidwatcher = callPackage ../applications/misc/jbidwatcher { }; + jbidwatcher = callPackage ../applications/misc/jbidwatcher { + java = if stdenv.isLinux then jre else jdk; + }; qrdecode = builderDefsPackage (import ../tools/graphics/qrdecode) { inherit libpng opencv; |