From 94ede7a646a551386236f92172339fd13255d7e4 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Mon, 7 Dec 2020 23:59:22 +0000 Subject: [PATCH] pythonPackages.pygame: switch to SDL2, fix build --- pkgs/development/python-modules/pygame/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix index 81c4d4a4b9c..673b14bfe4f 100644 --- a/pkgs/development/python-modules/pygame/default.nix +++ b/pkgs/development/python-modules/pygame/default.nix @@ -1,5 +1,5 @@ { lib, fetchPypi, buildPythonPackage, python, pkg-config, libX11 -, SDL, SDL_image, SDL_mixer, SDL_ttf, libpng, libjpeg, portmidi, freetype +, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, libpng, libjpeg, portmidi, freetype }: buildPythonPackage rec { @@ -12,11 +12,11 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - pkg-config SDL + pkg-config SDL2 ]; buildInputs = [ - SDL SDL_image SDL_mixer SDL_ttf libpng libjpeg + SDL2 SDL2_image SDL2_mixer SDL2_ttf libpng libjpeg portmidi libX11 freetype ]; @@ -27,8 +27,7 @@ buildPythonPackage rec { sed \ -e "s/origincdirs = .*/origincdirs = []/" \ -e "s/origlibdirs = .*/origlibdirs = []/" \ - -e "/'\/lib\/i386-linux-gnu', '\/lib\/x86_64-linux-gnu']/d" \ - -e "/\/include\/smpeg/d" \ + -e "/linux-gnu/d" \ -i buildconfig/config_unix.py ${lib.concatMapStrings (dep: '' sed \