pattypan: build with JDK that includes JavaFX

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>

+5 -5
+2 -4
pkgs/applications/misc/pattypan/default.nix
··· 1 1 { lib 2 2 , stdenv 3 3 , fetchFromGitHub 4 - , unzip 5 - , jre 6 4 , jdk 7 5 , ant 8 6 , makeWrapper ··· 24 22 }; 25 23 26 24 nativeBuildInputs = [ copyDesktopItems jdk ant makeWrapper wrapGAppsHook ]; 27 - buildInputs = [ glib jre ]; 25 + buildInputs = [ glib jdk ]; 28 26 29 27 buildPhase = '' 30 28 runHook preBuild ··· 37 35 runHook preInstall 38 36 mkdir -p $out/bin $out/share/java 39 37 cp pattypan.jar $out/share/java/pattypan.jar 40 - makeWrapper ${jre}/bin/java $out/bin/pattypan \ 38 + makeWrapper ${jdk}/bin/java $out/bin/pattypan \ 41 39 --add-flags "-cp $out/share/java/pattypan.jar pattypan.Launcher" 42 40 runHook postInstall 43 41 '';
+3 -1
pkgs/top-level/all-packages.nix
··· 30862 30862 30863 30863 molsketch = libsForQt5.callPackage ../applications/editors/molsketch { }; 30864 30864 30865 - pattypan = callPackage ../applications/misc/pattypan { }; 30865 + pattypan = callPackage ../applications/misc/pattypan { 30866 + jdk = jdk.override { enableJavaFX = true; }; 30867 + }; 30866 30868 30867 30869 praat = callPackage ../applications/audio/praat { }; 30868 30870