default.nix

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

pkgs/numptyphysics/default.nix

@@ -1,9 +1,9 @@
 { stdenv
 , fetchFromGitHub
 , lib
-, SDL
-, SDL_image
-, SDL_ttf
+, SDL2
+, SDL2_image
+, SDL2_ttf
 , libGL
 , glib
 , pkgconfig
@@ -11,17 +11,21 @@
 
 stdenv.mkDerivation rec {
   name = "numptyphysics";
-  version = "0.3.7";
+  version = "0.3.6";
   src = fetchFromGitHub {
     owner = "thp";
     repo = "numptyphysics";
     rev = version;
-    sha256 = "1g3pl5ghan7g173zgwz0jkm3swy2r00gng392w25fsj5lf1g1v5x";
+    sha256 = "03cqzp8wj00kwc5ykhk27vv9jpgcn8b99lkfzj557lmvvyx1rrsd";
   };
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ SDL SDL_image SDL_ttf glib libGL ];
+  buildInputs = [ SDL2 SDL2_image SDL2_ttf glib libGL ];
   enableParallelBuilding = true;
-  makeFlags = [ "PLATFORM=sdl1" "V=1" "DESTDIR=$(out)" "PREFIX=''" ];
+  patches = [
+    # always build against libGL, as upstream check depends on FHS lib locations
+    ./use-libgl.patch
+  ];
+  installFlags = [ "DESTDIR=$(out)" "PREFIX=''" ];
 
   meta = {
     maintainers = [ lib.maintainers.schmittlauch ];

pkgs/numptyphysics/use-libgl.patch

@@ -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