diff options
| author | Peter Simons <simons@cryp.to> | 2011-07-24 20:26:28 +0000 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2011-07-24 20:26:28 +0000 |
| commit | 7e9676bab5527bca8310adea09ce967e7b9ea9b9 (patch) | |
| tree | 09a5dea05b6fc6c3ba0dbb7d1aca1b38fc5783db /pkgs/top-level | |
| parent | 20ebca303e3372317c01c0c54f64f3d6423b094c (diff) | |
| download | nixlib-7e9676bab5527bca8310adea09ce967e7b9ea9b9.tar nixlib-7e9676bab5527bca8310adea09ce967e7b9ea9b9.tar.gz nixlib-7e9676bab5527bca8310adea09ce967e7b9ea9b9.tar.bz2 nixlib-7e9676bab5527bca8310adea09ce967e7b9ea9b9.tar.lz nixlib-7e9676bab5527bca8310adea09ce967e7b9ea9b9.tar.xz nixlib-7e9676bab5527bca8310adea09ce967e7b9ea9b9.tar.zst nixlib-7e9676bab5527bca8310adea09ce967e7b9ea9b9.zip | |
jbidwatcher: generalized java support so that the package can be built on Darwin, too
svn path=/nixpkgs/trunk/; revision=27923
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
1 files changed, 3 insertions, 1 deletions
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; |