diff options
| author | Cosima Neidahl <opna2608@protonmail.com> | 2024-03-05 17:11:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-05 17:11:04 +0100 |
| commit | 6165e21e24eb922cbb043517acf51e3ce24f7ffc (patch) | |
| tree | bb5f1492ad7ea378b9f874431362a1851418b881 /pkgs/applications/emulators | |
| parent | 53e51f97f6085ffa8793d9b8f6d7aaecc5d3ebcf (diff) | |
| parent | 7d46e39bdf3e8a9193b062225649b047a513c48f (diff) | |
| download | nixlib-6165e21e24eb922cbb043517acf51e3ce24f7ffc.tar nixlib-6165e21e24eb922cbb043517acf51e3ce24f7ffc.tar.gz nixlib-6165e21e24eb922cbb043517acf51e3ce24f7ffc.tar.bz2 nixlib-6165e21e24eb922cbb043517acf51e3ce24f7ffc.tar.lz nixlib-6165e21e24eb922cbb043517acf51e3ce24f7ffc.tar.xz nixlib-6165e21e24eb922cbb043517acf51e3ce24f7ffc.tar.zst nixlib-6165e21e24eb922cbb043517acf51e3ce24f7ffc.zip | |
Merge pull request #293171 from hughobrien/dosbox-x
dosbox-x: 2023.10.06 -> 2024.03.01
Diffstat (limited to 'pkgs/applications/emulators')
| -rw-r--r-- | pkgs/applications/emulators/dosbox-x/default.nix | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/pkgs/applications/emulators/dosbox-x/default.nix b/pkgs/applications/emulators/dosbox-x/default.nix index f26a12884222..c499c69e5442 100644 --- a/pkgs/applications/emulators/dosbox-x/default.nix +++ b/pkgs/applications/emulators/dosbox-x/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , alsa-lib , AudioUnit , autoreconfHook @@ -28,30 +27,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "dosbox-x"; - version = "2023.10.06"; + version = "2024.03.01"; src = fetchFromGitHub { owner = "joncampbell123"; repo = "dosbox-x"; rev = "dosbox-x-v${finalAttrs.version}"; - hash = "sha256-YNYtYqcpTOx4xS/LXI53h3S+na8JVpn4w8Dhf4fWNBQ="; + hash = "sha256-EcAp7KyqXdBACEbPgkM1INoKeGVo7hMDUx97y2RcX+k="; }; - patches = [ - # 2 patches which fix stack smashing when launching Windows 3.0 - # Remove when version > 2023.10.06 - (fetchpatch { - name = "0001-dosbox-x-Attempt-to-fix-graphical-palette-issues-added-by-TTF-fix.patch"; - url = "https://github.com/joncampbell123/dosbox-x/commit/40bf135f70376b5c3944fe2e972bdb7143439bcc.patch"; - hash = "sha256-9whtqBkivYVYaPObyTODtwcfjaoK+rLqhCNZ7zVoiGI="; - }) - (fetchpatch { - name = "0002-dosbox-x-Fix-Sid-Meiers-Civ-crash.patch"; - url = "https://github.com/joncampbell123/dosbox-x/compare/cdcfb554999572e758b81edf85a007d398626b78..ac91760d9353c301e1da382f93e596238cf6d336.patch"; - hash = "sha256-G7HbUhYEi6JJklN1z3JiOTnWLuWb27bMDyB/iGwywuY="; - }) - ]; - strictDeps = true; nativeBuildInputs = [ |