From e8a79999c0f6379be8a088807040f7e4c3221517 Mon Sep 17 00:00:00 2001 From: Ricardo Ardissone Date: Thu, 20 Dec 2018 15:01:46 -0200 Subject: [PATCH 1/2] liquidwar6: fix double definition of GL_GLEXT_VERSION --- pkgs/games/liquidwar/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/games/liquidwar/default.nix b/pkgs/games/liquidwar/default.nix index 9a6ff4e0ae8..6f0475209be 100644 --- a/pkgs/games/liquidwar/default.nix +++ b/pkgs/games/liquidwar/default.nix @@ -27,7 +27,11 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; + NIX_CFLAGS_COMPILE = + "-Wno-error=deprecated-declarations" + + # Avoid GL_GLEXT_VERSION double definition + " -DNO_SDL_GLEXT" + ; # To avoid problems finding SDL_types.h. configureFlags = [ "CFLAGS=-I${SDL.dev}/include/SDL" ]; From cb24feaa7253010d528e4b82644282f1bd7c5a16 Mon Sep 17 00:00:00 2001 From: Ricardo Ardissone Date: Thu, 20 Dec 2018 15:02:20 -0200 Subject: [PATCH 2/2] liquidwar6: remove unneeded dependency on libGLU_combined --- pkgs/games/liquidwar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/liquidwar/default.nix b/pkgs/games/liquidwar/default.nix index 6f0475209be..303855fb348 100644 --- a/pkgs/games/liquidwar/default.nix +++ b/pkgs/games/liquidwar/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, xproto, libX11, libXrender -, gmp, libGLU_combined, libjpeg, libpng +, gmp, libjpeg, libpng , expat, gettext, perl, guile , SDL, SDL_image, SDL_mixer, SDL_ttf , curl, sqlite, libtool, readline @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ xproto libX11 gmp guile - libGLU_combined libjpeg libpng + libjpeg libpng expat gettext perl SDL SDL_image SDL_mixer SDL_ttf curl sqlite