Author: simons
Date: Sun Jul 24 20:26:28 2011
New Revision: 27923
URL: https://svn.nixos.org/websvn/nix/?rev=27923&sc=1
Log:
jbidwatcher: generalized java support so that the package can be built on
Darwin, too
Modified:
nixpkgs/trunk/pkgs/applications/misc/jbidwatcher/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/applications/misc/jbidwatcher/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/misc/jbidwatcher/default.nix Sun Jul
24 20:24:23 2011 (r27922)
+++ nixpkgs/trunk/pkgs/applications/misc/jbidwatcher/default.nix Sun Jul
24 20:26:28 2011 (r27923)
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, jre }:
+{ stdenv, fetchurl, java }:
stdenv.mkDerivation rec {
pname = "jbidwatcher";
@@ -11,7 +11,7 @@
sha256 = "0nrs9ly56cqn33dm1sjm53pzj1cf7jncwn4c8v0xyva4jqyz2y5p";
};
- buildInputs = [ jre ];
+ buildInputs = [ java ];
jarfile = "$out/share/java/${pname}/JBidwatcher.jar";
@@ -22,7 +22,7 @@
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}
'';
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Sun Jul 24 20:24:23
2011 (r27922)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Sun Jul 24 20:26:28
2011 (r27923)
@@ -6427,7 +6427,9 @@
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;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
