From 93d0685492e41a632f1fa923d64c027cb177d293 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 4 Jul 2021 20:30:41 +0200 Subject: [PATCH] numptyphysics: build against SDL1 for (broken) fullscreen support see bug https://github.com/thp/numptyphysics/issues/34 --- default.nix | 2 +- pkgs/numptyphysics/default.nix | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) 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 edb5283..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 @@ -19,9 +19,9 @@ stdenv.mkDerivation rec { sha256 = "1g3pl5ghan7g173zgwz0jkm3swy2r00gng392w25fsj5lf1g1v5x"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ SDL2 SDL2_image SDL2_ttf glib libGL ]; + buildInputs = [ SDL SDL_image SDL_ttf glib libGL ]; enableParallelBuilding = true; - installFlags = [ "DESTDIR=$(out)" "PREFIX=''" ]; + makeFlags = [ "PLATFORM=sdl1" "V=1" "DESTDIR=$(out)" "PREFIX=''" ]; meta = { maintainers = [ lib.maintainers.schmittlauch ];