schmittlauch/nur-packages
1
0
Fork 0
mirror of https://github.com/schmittlauch/nur-packages synced 2025-05-11 08:00:17 +02:00
Code Issues Projects Releases Wiki Activity

numptyphysics: force build against libGL, unbreak

Browse source
This commit is contained in:
Trolli Schmittlauch 2021-06-17 23:24:34 +02:00
parent 59c204446f
commit 37c4e8724c
3 changed files with 25 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
default.nix
View file

@ -17,5 +17,5 @@ rec {
lolcommits = pkgs.callPackage ./pkgs/lolcommits { mplayer = mplayerV4l; }; lolcommits = pkgs.callPackage ./pkgs/lolcommits { mplayer = mplayerV4l; };
mplayerV4l = pkgs.mplayer.override { v4lSupport = true; }; mplayerV4l = pkgs.mplayer.override { v4lSupport = true; };
vollkorn = pkgs.callPackage ./pkgs/vollkorn { }; vollkorn = pkgs.callPackage ./pkgs/vollkorn { };
numptyphysics = pkgs.callPackage ./pkgs/numptyphysics { }; numptyphysics = pkgs.callPackage ./pkgs/numptyphysics { SDL2 = pkgs.SDL2.override {openglSupport = true; }; };
} }

8
pkgs/numptyphysics/default.nix
View file

@ -5,7 +5,6 @@
, SDL2_image , SDL2_image
, SDL2_ttf , SDL2_ttf
, libGL , libGL
, libGLU
, glib , glib
, pkgconfig , pkgconfig
}: }:
@ -20,12 +19,15 @@ stdenv.mkDerivation rec {
sha256 = "03cqzp8wj00kwc5ykhk27vv9jpgcn8b99lkfzj557lmvvyx1rrsd"; sha256 = "03cqzp8wj00kwc5ykhk27vv9jpgcn8b99lkfzj557lmvvyx1rrsd";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ SDL2 SDL2_image SDL2_ttf glib libGL libGLU ]; buildInputs = [ SDL2 SDL2_image SDL2_ttf glib libGL ];
enableParallelBuilding = true; enableParallelBuilding = true;
patches = [
# always build against libGL, as upstream check depends on FHS lib locations
./use-libgl.patch
];
installFlags = [ "DESTDIR=$(out)" "PREFIX=''" ]; installFlags = [ "DESTDIR=$(out)" "PREFIX=''" ];
meta = { meta = {
broken = true;
maintainers = [ lib.maintainers.schmittlauch ]; maintainers = [ lib.maintainers.schmittlauch ];
license = lib.licenses.gpl3Plus; license = lib.licenses.gpl3Plus;
description = "a drawing puzzle game based on construction and physics puzzles"; description = "a drawing puzzle game based on construction and physics puzzles";

19
pkgs/numptyphysics/use-libgl.patch Normal file
View file

@ -0,0 +1,19 @@
diff --git a/platform/gl/gl.mk b/platform/gl/gl.mk
index 094a69b..f374acd 100644
--- a/platform/gl/gl.mk
+++ b/platform/gl/gl.mk
@@ -2,13 +2,8 @@
ifeq ($(shell uname),Darwin)
LIBS += -framework OpenGL
else ifneq ($(PLATFORM),mingw)
-ifneq ($(wildcard $(patsubst %,%/libGL.so.1,/usr/lib /usr/lib64 /usr/lib/* /usr/lib/*/mesa)),)
+# quick and dirty patch: always use libGL without checking
$(eval $(call add_pkgconfig,gl))
else
-$(eval $(call add_pkgconfig,glesv2))
-CFLAGS += -DUSE_OPENGL_ES
-CXXFLAGS += -DUSE_OPENGL_ES
-endif
-else
LIBS += -lopengl32
endif