Merge pull request #213708 from logo4poop/hashlink-1.13

hashlink: 1.12 -> 1.13

pkgs/development/interpreters/hashlink/default.nix

@@ -17,17 +17,15 @@
 
 stdenv.mkDerivation rec {
   pname = "hashlink";
-  version = "1.12";
+  version = "1.13";
 
   src = fetchFromGitHub {
     owner = "HaxeFoundation";
     repo = "hashlink";
     rev = version;
-    sha256 = "AiUGhTxz4Pkrks4oE+SAuAQPMuC5T2B6jo3Jd3sNrkQ=";
+    sha256 = "lpHW0JWxbLtOBns3By56ZBn47CZsDzwOFBuW9MlERrE=";
   };
 
-  patches = [ ./hashlink.patch ];
-
   makeFlags = [ "PREFIX=$(out)" ];
 
   buildInputs = [

pkgs/development/interpreters/hashlink/hashlink.patch

@@ -1,32 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -107,6 +107,7 @@ LIBFLAGS += -L/opt/libjpeg-turbo/lib64
- endif
- 
- LIBOPENAL = -lopenal
-+LIBOPENGL = -lGL
- RELEASE_NAME = linux
- 
- endif
---- a/libs/sdl/gl.c
-+++ b/libs/sdl/gl.c
-@@ -7,7 +7,7 @@
- #	include <OpenGLES/ES3/gl.h>
- #	define HL_GLES
- #elif defined(HL_MAC)
--#	include <SDL.h>
-+#	include <SDL2/SDL.h>
- #	include <OpenGL/gl3.h>
- #	define glBindImageTexture(...) hl_error("Not supported on OSX")
- #	define glDispatchCompute(...) hl_error("Not supported on OSX")
---- a/libs/sdl/sdl.c
-+++ b/libs/sdl/sdl.c
-@@ -7,7 +7,7 @@
- #	include <SDL.h>
- #	include <SDL_syswm.h>
- #elif defined(HL_MAC)
--#	include <SDL.h>
-+#	include <SDL2/SDL.h>
- #else
- #	include <SDL2/SDL.h>
- #endif