diff options
author | Andrew Marshall <andrew@johnandrewmarshall.com> | 2023-10-25 22:26:25 -0400 |
---|---|---|
committer | Andrew Marshall <andrew@johnandrewmarshall.com> | 2023-10-25 22:26:25 -0400 |
commit | 0b8da5fde3a371f9d34bc27da3def771ef0d5401 (patch) | |
tree | 3b215ae94c193fc94b8fd28e17f23d18cec99601 /pkgs/applications | |
parent | 8efd5d1e283604f75a808a20e6cde0ef313d07d4 (diff) | |
download | nixpkgs-0b8da5fde3a371f9d34bc27da3def771ef0d5401.tar nixpkgs-0b8da5fde3a371f9d34bc27da3def771ef0d5401.tar.gz nixpkgs-0b8da5fde3a371f9d34bc27da3def771ef0d5401.tar.bz2 nixpkgs-0b8da5fde3a371f9d34bc27da3def771ef0d5401.tar.lz nixpkgs-0b8da5fde3a371f9d34bc27da3def771ef0d5401.tar.xz nixpkgs-0b8da5fde3a371f9d34bc27da3def771ef0d5401.tar.zst nixpkgs-0b8da5fde3a371f9d34bc27da3def771ef0d5401.zip |
libretro.mame2015: fix build on Python 3.11+
Since Python 3.11, `open()` etc. no longer accept `U` flag.
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/emulators/retroarch/cores.nix | 1 | ||||
-rw-r--r-- | pkgs/applications/emulators/retroarch/patches/mame2015-python311.patch | 61 |
2 files changed, 62 insertions, 0 deletions
diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index d1cbf12b34d..c18b26b1b24 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -568,6 +568,7 @@ in mame2015 = mkLibretroCore { core = "mame2015"; + patches = [ ./patches/mame2015-python311.patch ]; makeFlags = [ "PYTHON=python3" ]; extraNativeBuildInputs = [ python3 ]; extraBuildInputs = [ alsa-lib ]; diff --git a/pkgs/applications/emulators/retroarch/patches/mame2015-python311.patch b/pkgs/applications/emulators/retroarch/patches/mame2015-python311.patch new file mode 100644 index 00000000000..5827ba14150 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/patches/mame2015-python311.patch @@ -0,0 +1,61 @@ +diff --git a/src/emu/cpu/m6502/m6502make.py b/src/emu/cpu/m6502/m6502make.py +index da29fc722a..3de641dd69 100755 +--- a/src/emu/cpu/m6502/m6502make.py ++++ b/src/emu/cpu/m6502/m6502make.py +@@ -16,7 +16,7 @@ def load_opcodes(fname): + opcodes = [] + logging.info("load_opcodes: %s", fname) + try: +- f = open(fname, "rU") ++ f = open(fname, "r") + except Exception: + err = sys.exc_info()[1] + logging.error("cannot read opcodes file %s [%s]", fname, err) +@@ -39,7 +39,7 @@ def load_disp(fname): + logging.info("load_disp: %s", fname) + states = [] + try: +- f = open(fname, "rU") ++ f = open(fname, "r") + except Exception: + err = sys.exc_info()[1] + logging.error("cannot read display file %s [%s]", fname, err) +diff --git a/src/emu/cpu/m6809/m6809make.py b/src/emu/cpu/m6809/m6809make.py +index c3d5b0f66e..79f6f90cdd 100644 +--- a/src/emu/cpu/m6809/m6809make.py ++++ b/src/emu/cpu/m6809/m6809make.py +@@ -14,7 +14,7 @@ def load_file(fname, lines): + if path != "": + path += '/' + try: +- f = open(fname, "rU") ++ f = open(fname, "r") + except Exception: + err = sys.exc_info()[1] + sys.stderr.write("Cannot read opcodes file %s [%s]\n" % (fname, err)) +diff --git a/src/emu/cpu/mcs96/mcs96make.py b/src/emu/cpu/mcs96/mcs96make.py +index ec5ec37a78..7ab806a653 100644 +--- a/src/emu/cpu/mcs96/mcs96make.py ++++ b/src/emu/cpu/mcs96/mcs96make.py +@@ -71,7 +71,7 @@ def __init__(self, fname, is_196): + self.ea = {} + self.macros = {} + try: +- f = open(fname, "rU") ++ f = open(fname, "r") + except Exception: + err = sys.exc_info()[1] + sys.stderr.write("Cannot read opcodes file %s [%s]\n" % (fname, err)) +diff --git a/src/emu/cpu/tms57002/tmsmake.py b/src/emu/cpu/tms57002/tmsmake.py +index 62092097d9..78f9fe43cd 100755 +--- a/src/emu/cpu/tms57002/tmsmake.py ++++ b/src/emu/cpu/tms57002/tmsmake.py +@@ -326,7 +326,7 @@ def ins_cmp_dasm(a, b): + def LoadLst(filename): + instructions = [] + ins = None +- for n, line in enumerate(open(filename, "rU")): ++ for n, line in enumerate(open(filename, "r")): + line = line.rstrip() + if not line and ins: + # new lines separate intructions |