From d8fc19da052db89735b21674c2e224078e53ce33 Mon Sep 17 00:00:00 2001 From: lostdj Date: Sun, 14 Sep 2014 18:33:24 +0400 Subject: SmartGitHg: don't assume we're on OpenJDK and replace JDK dependency with JRE. Closes #4081. Signed-off-by: Mateusz Kowalczyk --- pkgs/applications/version-management/smartgithg/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'pkgs/applications/version-management/smartgithg/default.nix') diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix index a3d4783d20d11..d729159316d27 100644 --- a/pkgs/applications/version-management/smartgithg/default.nix +++ b/pkgs/applications/version-management/smartgithg/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, lib, makeWrapper -, jdk +, jre , gtk, glib , libXtst , git, mercurial, subversion @@ -22,14 +22,14 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper - jdk + jre ]; buildCommand = let pkg_path = "$out/${name}"; bin_path = "$out/bin"; runtime_paths = lib.makeSearchPath "bin" [ - jdk + jre git mercurial subversion which ]; @@ -43,10 +43,15 @@ stdenv.mkDerivation rec { # unpacking should have produced a dir named ${name} cp -a ${name} $out mkdir -pv ${bin_path} + [ -d ${jre}/lib/openjdk ] \ + && jre=${jre}/lib/openjdk \ + || jre=${jre} makeWrapper ${pkg_path}/bin/smartgithg.sh ${bin_path}/smartgithg \ --prefix PATH : ${runtime_paths} \ --prefix LD_LIBRARY_PATH : ${runtime_lib_paths} \ - --prefix JDK_HOME : ${jdk}/lib/openjdk + --prefix JRE_HOME : ${jre} \ + --prefix JAVA_HOME : ${jre} \ + --prefix SMARTGITHG_JAVA_HOME : ${jre} patchShebangs $out ''; -- cgit 1.4.1