pythonPackages.pygame: switch to SDL2, fix build
This commit is contained in:
parent
fcba021ac9
commit
94ede7a646
@ -1,5 +1,5 @@
|
|||||||
{ lib, fetchPypi, buildPythonPackage, python, pkg-config, libX11
|
{ 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 {
|
buildPythonPackage rec {
|
||||||
@ -12,11 +12,11 @@ buildPythonPackage rec {
|
|||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
pkg-config SDL
|
pkg-config SDL2
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
SDL SDL_image SDL_mixer SDL_ttf libpng libjpeg
|
SDL2 SDL2_image SDL2_mixer SDL2_ttf libpng libjpeg
|
||||||
portmidi libX11 freetype
|
portmidi libX11 freetype
|
||||||
];
|
];
|
||||||
|
|
||||||
@ -27,8 +27,7 @@ buildPythonPackage rec {
|
|||||||
sed \
|
sed \
|
||||||
-e "s/origincdirs = .*/origincdirs = []/" \
|
-e "s/origincdirs = .*/origincdirs = []/" \
|
||||||
-e "s/origlibdirs = .*/origlibdirs = []/" \
|
-e "s/origlibdirs = .*/origlibdirs = []/" \
|
||||||
-e "/'\/lib\/i386-linux-gnu', '\/lib\/x86_64-linux-gnu']/d" \
|
-e "/linux-gnu/d" \
|
||||||
-e "/\/include\/smpeg/d" \
|
|
||||||
-i buildconfig/config_unix.py
|
-i buildconfig/config_unix.py
|
||||||
${lib.concatMapStrings (dep: ''
|
${lib.concatMapStrings (dep: ''
|
||||||
sed \
|
sed \
|
||||||
|
Loading…
x
Reference in New Issue
Block a user