diff options
author | lostdj <lostdj@gmail.com> | 2014-09-14 18:33:24 +0400 |
---|---|---|
committer | Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk> | 2014-09-20 23:11:35 +0100 |
commit | d8fc19da052db89735b21674c2e224078e53ce33 (patch) | |
tree | 6706d1c9f424f9ea417cbe5f16387e2bbc235375 /pkgs/applications/version-management/smartgithg/default.nix | |
parent | c7bbc288b5e3afc22e96a92a849371f8255294f8 (diff) |
SmartGitHg: don't assume we're on OpenJDK and replace JDK dependency
with JRE. Closes #4081. Signed-off-by: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Diffstat (limited to 'pkgs/applications/version-management/smartgithg/default.nix')
-rw-r--r-- | pkgs/applications/version-management/smartgithg/default.nix | 13 |
1 files changed, 9 insertions, 4 deletions
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 ''; |