dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

SmartGitHg: don't assume we're on OpenJDK and replace JDK dependency

Browse Source 
with JRE.

Closes #4081.

Signed-off-by: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
This commit is contained in:
lostdj 2014-09-14 18:33:24 +04:00 committed by Mateusz Kowalczyk
parent c7bbc288b5
commit d8fc19da05
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/applications/version-management/smartgithg/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, lib, makeWrapper { stdenv, fetchurl, lib, makeWrapper
, jdk , jre
, gtk, glib , gtk, glib
, libXtst , libXtst
, git, mercurial, subversion , git, mercurial, subversion
@ -22,14 +22,14 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
makeWrapper makeWrapper
jdk jre
]; ];
buildCommand = let buildCommand = let
pkg_path = "$out/${name}"; pkg_path = "$out/${name}";
bin_path = "$out/bin"; bin_path = "$out/bin";
runtime_paths = lib.makeSearchPath "bin" [ runtime_paths = lib.makeSearchPath "bin" [
jdk jre
git mercurial subversion git mercurial subversion
which which
]; ];
@ -43,10 +43,15 @@ stdenv.mkDerivation rec {
# unpacking should have produced a dir named ${name} # unpacking should have produced a dir named ${name}
cp -a ${name} $out cp -a ${name} $out
mkdir -pv ${bin_path} mkdir -pv ${bin_path}
[ -d ${jre}/lib/openjdk ] \
&& jre=${jre}/lib/openjdk \
|| jre=${jre}
makeWrapper ${pkg_path}/bin/smartgithg.sh ${bin_path}/smartgithg \ makeWrapper ${pkg_path}/bin/smartgithg.sh ${bin_path}/smartgithg \
--prefix PATH : ${runtime_paths} \ --prefix PATH : ${runtime_paths} \
--prefix LD_LIBRARY_PATH : ${runtime_lib_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 patchShebangs $out
''; '';