Unverified Commit 41afad99 authored by Philip Taron's avatar Philip Taron Committed by GitHub
Browse files

Merge pull request #331640 from eljamm/processing 

processing: fix build
parents 91f13b83 0dbf5b7b

pkgs/applications/graphics/processing/default.nix

+42 −8
Original line number Diff line number Diff line 
{ lib, stdenv, fetchFromGitHub, fetchurl, ant, unzip, makeWrapper, jdk, jogl, rsync, ffmpeg, batik, stripJavaArchivesHook, wrapGAppsHook3, libGL }:

{

  lib,

  stdenv,

  fetchFromGitHub,

  fetchurl,

  ant,

  unzip,

  makeWrapper,

  jdk,

  jogl,

  rsync,

  ffmpeg,

  batik,

  stripJavaArchivesHook,

  wrapGAppsHook3,

  libGL,

}:

let

  buildNumber = "1293";

  vaqua = fetchurl {
@@ -37,9 +53,11 @@ let 
    sha256 = "sha256-N4U04znm5tULFzb7Ort28cFdG+P0wTzsbVNkEuI9pgM=";

  };



  arch = {

  arch =

    {

      x86_64 = "amd64";

  }.${stdenv.hostPlatform.parsed.cpu.name} or stdenv.hostPlatform.parsed.cpu.name;

    }

    .${stdenv.hostPlatform.parsed.cpu.name} or stdenv.hostPlatform.parsed.cpu.name;

in

stdenv.mkDerivation rec {

  pname = "processing";
@@ -52,8 +70,21 @@ stdenv.mkDerivation rec { 
    sha256 = "sha256-SzQemZ6iZ9o89/doV8YMv7DmyPSDyckJl3oyxJyfrm0=";

  };



  nativeBuildInputs = [ ant unzip makeWrapper stripJavaArchivesHook wrapGAppsHook3 ];

  buildInputs = [ jdk jogl ant rsync ffmpeg batik ];

  nativeBuildInputs = [

    ant

    unzip

    makeWrapper

    stripJavaArchivesHook

    wrapGAppsHook3

  ];

  buildInputs = [

    jdk

    jogl

    ant

    rsync

    ffmpeg

    batik

  ];



  dontWrapGApps = true;
@@ -74,7 +105,7 @@ stdenv.mkDerivation rec { 
    mv app/lib/{jna-5.10.0/dist/jna.jar,}

    mv app/lib/{jna-5.10.0/dist/jna-platform.jar,}

    ln -sf ${batik}/* java/libraries/svg/library/

    cp java/libraries/svg/library/lib/batik-all-${batik.version}.jar java/libraries/svg/library/batik.jar

    cp java/libraries/svg/library/share/java/batik-all-${batik.version}.jar java/libraries/svg/library/batik.jar

    echo "tarring ffmpeg"

    tar --checkpoint=10000 -czf build/shared/tools/MovieMaker/ffmpeg-5.0.1.gz ${ffmpeg}

    cd build
@@ -108,7 +139,10 @@ stdenv.mkDerivation rec { 
  meta = with lib; {

    description = "Language and IDE for electronic arts";

    homepage = "https://processing.org";

    license = with licenses; [ gpl2Only lgpl21Only ];

    license = with licenses; [

      gpl2Only

      lgpl21Only

    ];

    platforms = platforms.linux;

    maintainers = with maintainers; [ evan-goode ];

  };