diff --git a/default.nix b/default.nix index 775db5d..5eac586 100644 --- a/default.nix +++ b/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 { SDL2 = pkgs.SDL2.override {openglSupport = true; }; }; + numptyphysics = pkgs.callPackage ./pkgs/numptyphysics { }; } diff --git a/pkgs/numptyphysics/default.nix b/pkgs/numptyphysics/default.nix index cdab363..b3355cd 100644 --- a/pkgs/numptyphysics/default.nix +++ b/pkgs/numptyphysics/default.nix @@ -1,9 +1,9 @@ { stdenv , fetchFromGitHub , lib -, SDL2 -, SDL2_image -, SDL2_ttf +, SDL +, SDL_image +, SDL_ttf , libGL , glib , pkgconfig @@ -11,21 +11,17 @@ stdenv.mkDerivation rec { name = "numptyphysics"; - version = "0.3.6"; + version = "0.3.7"; src = fetchFromGitHub { owner = "thp"; repo = "numptyphysics"; rev = version; - sha256 = "03cqzp8wj00kwc5ykhk27vv9jpgcn8b99lkfzj557lmvvyx1rrsd"; + sha256 = "1g3pl5ghan7g173zgwz0jkm3swy2r00gng392w25fsj5lf1g1v5x"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ SDL2 SDL2_image SDL2_ttf glib libGL ]; + buildInputs = [ SDL SDL_image SDL_ttf glib libGL ]; enableParallelBuilding = true; - patches = [ - # always build against libGL, as upstream check depends on FHS lib locations - ./use-libgl.patch - ]; - installFlags = [ "DESTDIR=$(out)" "PREFIX=''" ]; + makeFlags = [ "PLATFORM=sdl1" "V=1" "DESTDIR=$(out)" "PREFIX=''" ]; meta = { maintainers = [ lib.maintainers.schmittlauch ]; diff --git a/pkgs/numptyphysics/use-libgl.patch b/pkgs/numptyphysics/use-libgl.patch deleted file mode 100644 index 56b984a..0000000 --- a/pkgs/numptyphysics/use-libgl.patch +++ /dev/null @@ -1,19 +0,0 @@ -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