diff options
| author | Martin Bravenboer <martin.bravenboer@logicblox.com> | 2005-09-17 23:58:51 +0000 |
|---|---|---|
| committer | Martin Bravenboer <martin.bravenboer@logicblox.com> | 2005-09-17 23:58:51 +0000 |
| commit | 4c70ef7e5dc4e65c989160a54ad104beaa1b10d5 (patch) | |
| tree | c8e0fff64e5565608c717839fa7d25c20d9b6f35 /pkgs/development/tools/misc/swig | |
| parent | 3919e7593ae7feef27c91842a2c49a7539ee7a01 (diff) | |
| download | nixlib-4c70ef7e5dc4e65c989160a54ad104beaa1b10d5.tar nixlib-4c70ef7e5dc4e65c989160a54ad104beaa1b10d5.tar.gz nixlib-4c70ef7e5dc4e65c989160a54ad104beaa1b10d5.tar.bz2 nixlib-4c70ef7e5dc4e65c989160a54ad104beaa1b10d5.tar.lz nixlib-4c70ef7e5dc4e65c989160a54ad104beaa1b10d5.tar.xz nixlib-4c70ef7e5dc4e65c989160a54ad104beaa1b10d5.tar.zst nixlib-4c70ef7e5dc4e65c989160a54ad104beaa1b10d5.zip | |
Cleaning up the java naming conventions
svn path=/nixpkgs/trunk/; revision=3871
Diffstat (limited to 'pkgs/development/tools/misc/swig')
| -rw-r--r-- | pkgs/development/tools/misc/swig/builder.sh | 2 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/swig/default.nix | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/tools/misc/swig/builder.sh b/pkgs/development/tools/misc/swig/builder.sh index d57a2199f737..b4ac1b18a1f5 100644 --- a/pkgs/development/tools/misc/swig/builder.sh +++ b/pkgs/development/tools/misc/swig/builder.sh @@ -1,3 +1,3 @@ -buildInputs="$perl $python $j2sdk" +buildInputs="$perl $python $jdk" . $stdenv/setup genericBuild diff --git a/pkgs/development/tools/misc/swig/default.nix b/pkgs/development/tools/misc/swig/default.nix index 1e14ddc8f299..4cb3f1d0565e 100644 --- a/pkgs/development/tools/misc/swig/default.nix +++ b/pkgs/development/tools/misc/swig/default.nix @@ -1,9 +1,9 @@ { perlSupport, pythonSupport, javaSupport -, stdenv, fetchurl, perl ? null, python ? null, j2sdk ? null}: +, stdenv, fetchurl, perl ? null, python ? null, jdk ? null}: assert perlSupport -> perl != null; assert pythonSupport -> python != null; -assert javaSupport -> j2sdk != null; +assert javaSupport -> jdk != null; stdenv.mkDerivation { name = "swig-1.3.19"; @@ -18,5 +18,5 @@ stdenv.mkDerivation { perl = if perlSupport then perl else null; python = if pythonSupport then python else null; - j2sdk = if javaSupport then j2sdk else null; + jdk = if javaSupport then jdk else null; } \ No newline at end of file |