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