diff --git a/pkgs/applications/misc/pattypan/default.nix b/pkgs/applications/misc/pattypan/default.nix index 19a9b18ce193..89857b529389 100644 --- a/pkgs/applications/misc/pattypan/default.nix +++ b/pkgs/applications/misc/pattypan/default.nix @@ -1,8 +1,6 @@ { lib , stdenv , fetchFromGitHub -, unzip -, jre , jdk , ant , makeWrapper @@ -24,7 +22,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ copyDesktopItems jdk ant makeWrapper wrapGAppsHook ]; - buildInputs = [ glib jre ]; + buildInputs = [ glib jdk ]; buildPhase = '' runHook preBuild @@ -37,7 +35,7 @@ stdenv.mkDerivation rec { runHook preInstall mkdir -p $out/bin $out/share/java cp pattypan.jar $out/share/java/pattypan.jar - makeWrapper ${jre}/bin/java $out/bin/pattypan \ + makeWrapper ${jdk}/bin/java $out/bin/pattypan \ --add-flags "-cp $out/share/java/pattypan.jar pattypan.Launcher" runHook postInstall ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 80505d0f3d56..805f3ea8da38 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30861,7 +30861,9 @@ with pkgs; molsketch = libsForQt5.callPackage ../applications/editors/molsketch { }; - pattypan = callPackage ../applications/misc/pattypan { }; + pattypan = callPackage ../applications/misc/pattypan { + jdk = jdk.override { enableJavaFX = true; }; + }; praat = callPackage ../applications/audio/praat { };