From 138300330c967a5514b4b8e54f4619fb6902194b Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Wed, 22 Apr 2020 02:40:36 -0700 Subject: [PATCH] allegro4: 4.4.2 -> 4.4.3.1 (fixes atanks & racer) --- .../allegro/allegro4-mesa-18.2.5.patch | 26 ------------------- .../development/libraries/allegro/default.nix | 5 ++-- 2 files changed, 2 insertions(+), 29 deletions(-) delete mode 100644 pkgs/development/libraries/allegro/allegro4-mesa-18.2.5.patch diff --git a/pkgs/development/libraries/allegro/allegro4-mesa-18.2.5.patch b/pkgs/development/libraries/allegro/allegro4-mesa-18.2.5.patch deleted file mode 100644 index c49ebb550f3..00000000000 --- a/pkgs/development/libraries/allegro/allegro4-mesa-18.2.5.patch +++ /dev/null @@ -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 - #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 - #undef __glxext_h_ -+#undef __glx_glxext_h_ - - #ifndef GLX_VERSION_1_3 - #define AGLX_VERSION_1_3 diff --git a/pkgs/development/libraries/allegro/default.nix b/pkgs/development/libraries/allegro/default.nix index 963590d4faf..6071f63255d 100644 --- a/pkgs/development/libraries/allegro/default.nix +++ b/pkgs/development/libraries/allegro/default.nix @@ -5,15 +5,14 @@ stdenv.mkDerivation rec { pname = "allegro"; - version="4.4.2"; + version="4.4.3.1"; src = fetchurl { url = "https://github.com/liballeg/allegro5/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "1p0ghkmpc4kwij1z9rzxfv7adnpy4ayi0ifahlns1bdzgmbyf88v"; + sha256 = "1m6lz35nk07dli26kkwz3wa50jsrxs1kb6w1nj14a911l34xn6gc"; }; patches = [ - ./allegro4-mesa-18.2.5.patch ./nix-unstable-sandbox-fix.patch ];