mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-21 12:59:04 +02:00
Merge pull request #85912 from chkno/allegro
allegro4: 4.4.2 -> 4.4.3.1 (fixes atanks & racer)
This commit is contained in:
commit
09079c4e76
|
@ -1,26 +0,0 @@
|
||||||
--- a/addons/allegrogl/include/alleggl.h
|
|
||||||
+++ b/addons/allegrogl/include/alleggl.h
|
|
||||||
@@ -63,9 +63,11 @@ typedef __int64 INT64;
|
|
||||||
/* HACK: Prevent both Mesa and SGI's broken headers from screwing us */
|
|
||||||
#define __glext_h_
|
|
||||||
#define __glxext_h_
|
|
||||||
+#define __glx_glxext_h_
|
|
||||||
#include <GL/gl.h>
|
|
||||||
#undef __glext_h_
|
|
||||||
#undef __glxext_h_
|
|
||||||
+#undef __glx_glxext_h_
|
|
||||||
|
|
||||||
#endif /* ALLEGRO_MACOSX */
|
|
||||||
|
|
||||||
--- a/addons/allegrogl/include/allegrogl/GLext/glx_ext_defs.h
|
|
||||||
+++ b/addons/allegrogl/include/allegrogl/GLext/glx_ext_defs.h
|
|
||||||
@@ -1,7 +1,9 @@
|
|
||||||
/* HACK: Prevent both Mesa and SGI's broken headers from screwing us */
|
|
||||||
#define __glxext_h_
|
|
||||||
+#define __glx_glxext_h_
|
|
||||||
#include <GL/glx.h>
|
|
||||||
#undef __glxext_h_
|
|
||||||
+#undef __glx_glxext_h_
|
|
||||||
|
|
||||||
#ifndef GLX_VERSION_1_3
|
|
||||||
#define AGLX_VERSION_1_3
|
|
|
@ -5,15 +5,14 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "allegro";
|
pname = "allegro";
|
||||||
version="4.4.2";
|
version="4.4.3.1";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://github.com/liballeg/allegro5/releases/download/${version}/${pname}-${version}.tar.gz";
|
url = "https://github.com/liballeg/allegro5/releases/download/${version}/${pname}-${version}.tar.gz";
|
||||||
sha256 = "1p0ghkmpc4kwij1z9rzxfv7adnpy4ayi0ifahlns1bdzgmbyf88v";
|
sha256 = "1m6lz35nk07dli26kkwz3wa50jsrxs1kb6w1nj14a911l34xn6gc";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
./allegro4-mesa-18.2.5.patch
|
|
||||||
./nix-unstable-sandbox-fix.patch
|
./nix-unstable-sandbox-fix.patch
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue