Unverified Commit 1ec04700 authored by figsoda's avatar figsoda Committed by GitHub
Browse files

Merge pull request #232701 from Scrumplex/pattypan-zhf 

pattypan: build with JDK that includes JavaFX
parents 938a78c4 9989f9d2

pkgs/applications/misc/pattypan/default.nix

+2 −4
Original line number Diff line number Diff line 
{ 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

  '';

pkgs/top-level/all-packages.nix

+3 −1
Original line number Diff line number Diff line
@@ -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 { };