diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-01-01 15:49:20 -0800 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-01-07 14:55:41 -0800 |
| commit | c82410eeda78deb3afe898168700772d53361985 (patch) | |
| tree | 1f7be826db3a134ad4fa765077fcdc93bab98d9f /pkgs/development/libraries | |
| parent | bbc4262514107fd6658696ddebfeba7071ac17b1 (diff) | |
| download | nixlib-c82410eeda78deb3afe898168700772d53361985.tar nixlib-c82410eeda78deb3afe898168700772d53361985.tar.gz nixlib-c82410eeda78deb3afe898168700772d53361985.tar.bz2 nixlib-c82410eeda78deb3afe898168700772d53361985.tar.lz nixlib-c82410eeda78deb3afe898168700772d53361985.tar.xz nixlib-c82410eeda78deb3afe898168700772d53361985.tar.zst nixlib-c82410eeda78deb3afe898168700772d53361985.zip | |
java: Normalize to the default jre / jdk
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/portmidi/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/libraries/portmidi/default.nix b/pkgs/development/libraries/portmidi/default.nix index 19eb390388bb..518eeee92538 100644 --- a/pkgs/development/libraries/portmidi/default.nix +++ b/pkgs/development/libraries/portmidi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, cmake, /*openjdk,*/ alsaLib }: +{ stdenv, fetchurl, unzip, cmake, /*jdk,*/ alsaLib }: stdenv.mkDerivation rec { name = "portmidi-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; cmakeFlags = let - #base = "${openjdk}/jre/lib/${openjdk.architecture}"; + #base = "${jdk}/jre/lib/${jdk.architecture}"; in [ "-DPORTMIDI_ENABLE_JAVA=0" /* TODO: Fix Java support. @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { ln -s libportmidi.so "$out/lib/libporttime.so" ''; - buildInputs = [ unzip cmake /*openjdk*/ alsaLib ]; + buildInputs = [ unzip cmake /*jdk*/ alsaLib ]; meta = { homepage = "http://portmedia.sourceforge.net/portmidi/"; |