colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

python310Packages.pygame: 2.1.2 -> 2.2.0

Browse Source 
Diff: https://github.com/pygame/pygame/compare/2.1.2...2.2.0

Changelog: https://github.com/pygame/pygame/releases/tag/2.2.0
This commit is contained in:
Robert Schütz 2023-03-09 12:23:45 -08:00
parent 510680e5e8
commit e65d5d9484
2 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/python-modules/pygame/default.nix
View File

@ -1,12 +1,16 @@
{ stdenv, lib, substituteAll, fetchFromGitHub, buildPythonPackage, python, pkg-config, libX11
, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, libpng, libjpeg, portmidi, freetype, fontconfig
, AppKit
, pythonAtLeast
, pythonOlder
}:
buildPythonPackage rec {
pname = "pygame";
version = "2.1.2";
version = "2.2.0";
disabled = pythonOlder "3.6";
format = "setuptools";
src = fetchFromGitHub {
owner = pname;
@ -15,7 +19,7 @@ buildPythonPackage rec {
# Unicode file names lead to different checksums on HFS+ vs. other
# filesystems because of unicode normalisation. The documentation
# has such files and will be removed.
hash = "sha256-v1z6caEMJNXqbcbTmFXoy3KQewHiz6qK4vhNU6Qbukk=";
hash = "sha256-SMkY3uN3kAlb/pbm047W0G8MJ7G8mCsfGVSPhzd5aEo=";
postFetch = "rm -rf $out/docs/reST";
};
@ -76,7 +80,5 @@ buildPythonPackage rec {
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ emilytrau ];
platforms = platforms.unix;
# fatal error: longintrepr.h: No such file or directory.
broken = pythonAtLeast "3.11"; # At 2022-02-27
};
}

17
pkgs/development/python-modules/pygame/fix-dependency-finding.patch
View File

@ -1,11 +1,11 @@
diff --git a/buildconfig/config_darwin.py b/buildconfig/config_darwin.py
index c785e183..37d5cea4 100644
index 9503ea70..d0d3ab6e 100644
--- a/buildconfig/config_darwin.py
+++ b/buildconfig/config_darwin.py
@@ -146,16 +146,8 @@ def main():
@@ -140,16 +140,8 @@ def main(auto_config=False):
])
print ('Hunting dependencies...')
print('Hunting dependencies...')
- incdirs = ['/usr/local/include', '/opt/homebrew/include']
- incdirs.extend(['/usr/local/include/SDL2', '/opt/homebrew/include/SDL2', '/opt/local/include/SDL2'])
-
@ -22,10 +22,10 @@ index c785e183..37d5cea4 100644
for d in DEPS:
if isinstance(d, (list, tuple)):
diff --git a/buildconfig/config_unix.py b/buildconfig/config_unix.py
index 5c50bcdc..2fd69e2d 100644
index 3eba5b5c..53cc6233 100644
--- a/buildconfig/config_unix.py
+++ b/buildconfig/config_unix.py
@@ -210,18 +210,8 @@ def main():
@@ -240,11 +240,8 @@ def main(auto_config=False):
if not DEPS[0].found:
raise RuntimeError('Unable to run "sdl-config". Please make sure a development version of SDL is installed.')
@ -34,13 +34,6 @@ index 5c50bcdc..2fd69e2d 100644
- for extrabase in extrabases:
- incdirs += [extrabase + d for d in origincdirs]
- libdirs += [extrabase + d for d in origlibdirs]
- incdirs += ["/usr"+d for d in origincdirs]
- libdirs += ["/usr"+d for d in origlibdirs]
- incdirs += ["/usr/local"+d for d in origincdirs]
- libdirs += ["/usr/local"+d for d in origlibdirs]
- if localbase:
- incdirs = [localbase+d for d in origincdirs]
- libdirs = [localbase+d for d in origlibdirs]
+ incdirs = @buildinputs_include@
+ libdirs = @buildinputs_lib@