From 5b143ccc91a63f19aee15fcb133c484d54bdca5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20B=C3=A4ckman?= <46724898+erikbackman@users.noreply.github.com> Date: Mon, 17 May 2021 19:16:51 +0200 Subject: [PATCH] numworks-epsilon: 15.3.2 -> 15.5.0 (#122760) Co-authored-by: erikbackman --- .../0001-ion-linux-makerules.patch | 12 ++++++++++++ .../science/math/numworks-epsilon/default.nix | 16 +++++++++++++--- 2 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 pkgs/applications/science/math/numworks-epsilon/0001-ion-linux-makerules.patch diff --git a/pkgs/applications/science/math/numworks-epsilon/0001-ion-linux-makerules.patch b/pkgs/applications/science/math/numworks-epsilon/0001-ion-linux-makerules.patch new file mode 100644 index 000000000000..0bc29b9aab5f --- /dev/null +++ b/pkgs/applications/science/math/numworks-epsilon/0001-ion-linux-makerules.patch @@ -0,0 +1,12 @@ +diff --git a/ion/src/simulator/linux/Makefile b/ion/src/simulator/linux/Makefile +index ca7da03fa..b05bba115 100644 +--- a/ion/src/simulator/linux/Makefile ++++ b/ion/src/simulator/linux/Makefile +@@ -28,7 +28,6 @@ ion_src += $(addprefix ion/src/simulator/shared/, \ + collect_registers.cpp \ + haptics.cpp \ + journal.cpp \ +- platform_action_modifier_ctrl.cpp \ + state_file.cpp \ + ) + diff --git a/pkgs/applications/science/math/numworks-epsilon/default.nix b/pkgs/applications/science/math/numworks-epsilon/default.nix index 9ec41386da5b..a90ebc67b65b 100644 --- a/pkgs/applications/science/math/numworks-epsilon/default.nix +++ b/pkgs/applications/science/math/numworks-epsilon/default.nix @@ -2,6 +2,8 @@ , lib , fetchFromGitHub , libpng +, libjpeg +, freetype , xorg , python3 , imagemagick @@ -11,18 +13,20 @@ stdenv.mkDerivation rec { pname = "numworks-epsilon"; - version = "15.3.2"; + version = "15.5.0"; src = fetchFromGitHub { owner = "numworks"; repo = "epsilon"; rev = version; - sha256 = "1q34dilyypiggjs16486jm122yf20wcigqxvspc77ig9albaxgh5"; + sha256 = "fPBO3FzZ4k5OxG+Ifc6R/au4Te974HNKAEdHz+aFdSg="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libpng + libjpeg + freetype xorg.libXext python3 imagemagick @@ -33,6 +37,12 @@ stdenv.mkDerivation rec { "PLATFORM=simulator" ]; + patches = [ + # Remove make rule Introduced in cba596dde7 + # which causes it to not build with nix + ./0001-ion-linux-makerules.patch + ]; + installPhase = '' runHook preInstall @@ -44,7 +54,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "Emulator for Epsilon, a High-performance graphing calculator operating system"; + description = "Simulator for Epsilon, a High-performance graphing calculator operating system"; homepage = "https://numworks.com/"; license = licenses.cc-by-nc-sa-40; maintainers = with maintainers; [ erikbackman ];