schmittlauch/nur-packages
1
0
Fork 0
mirror of https://github.com/schmittlauch/nur-packages synced 2025-09-10 08:24:55 +02:00
Code Issues Projects Releases Wiki Activity

Compare commits

base: schmittlauch:93d0685492e41a632f1fa923d64c027cb177d293
Branches Tags
schmittlauch:mainline
schmittlauch:dependabot/github_actions/cachix/install-nix-action-20
schmittlauch:dependabot/github_actions/actions/checkout-3.3.0
..
compare: schmittlauch:37c4e8724cebcbe7840feb4661cafd06d82ae321
Branches Tags
schmittlauch:dependabot/github_actions/cachix/install-nix-action-20
schmittlauch:dependabot/github_actions/actions/checkout-3.3.0
schmittlauch:mainline

No commits in common. "93d0685492e41a632f1fa923d64c027cb177d293" and "37c4e8724cebcbe7840feb4661cafd06d82ae321" have entirely different histories.
93d0685492 ... 37c4e8724c

3 changed files with 31 additions and 8 deletions
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; }; };
} }

18
pkgs/numptyphysics/default.nix
View file

@ -1,9 +1,9 @@
{ stdenv { stdenv
, fetchFromGitHub , fetchFromGitHub
, lib , lib
, SDL , SDL2
, SDL_image , SDL2_image
, SDL_ttf , SDL2_ttf
, libGL , libGL
, glib , glib
, pkgconfig , pkgconfig
@ -11,17 +11,21 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "numptyphysics"; name = "numptyphysics";
version = "0.3.7"; version = "0.3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "thp"; owner = "thp";
repo = "numptyphysics"; repo = "numptyphysics";
rev = version; rev = version;
sha256 = "1g3pl5ghan7g173zgwz0jkm3swy2r00gng392w25fsj5lf1g1v5x"; sha256 = "03cqzp8wj00kwc5ykhk27vv9jpgcn8b99lkfzj557lmvvyx1rrsd";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ SDL SDL_image SDL_ttf glib libGL ]; buildInputs = [ SDL2 SDL2_image SDL2_ttf glib libGL ];
enableParallelBuilding = true; 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 = { meta = {
maintainers = [ lib.maintainers.schmittlauch ]; maintainers = [ lib.maintainers.schmittlauch ];

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