about summary refs log tree commit diff
path: root/pkgs/applications/emulators
diff options
context:
space:
mode:
authorHugh O'Brien <github@hughobrien.ie>2024-03-03 23:35:05 -0500
committerHugh O'Brien <github@hughobrien.ie>2024-03-03 23:35:05 -0500
commit7d46e39bdf3e8a9193b062225649b047a513c48f (patch)
tree4961ea269a239e16666de9a4f9136b885ab4797b /pkgs/applications/emulators
parent90591b02e2f2215d66ac0907589b623445dc527d (diff)
downloadnixlib-7d46e39bdf3e8a9193b062225649b047a513c48f.tar
nixlib-7d46e39bdf3e8a9193b062225649b047a513c48f.tar.gz
nixlib-7d46e39bdf3e8a9193b062225649b047a513c48f.tar.bz2
nixlib-7d46e39bdf3e8a9193b062225649b047a513c48f.tar.lz
nixlib-7d46e39bdf3e8a9193b062225649b047a513c48f.tar.xz
nixlib-7d46e39bdf3e8a9193b062225649b047a513c48f.tar.zst
nixlib-7d46e39bdf3e8a9193b062225649b047a513c48f.zip
dosbox-x: 2023.10.06 -> 2024.03.01
Diffstat (limited to 'pkgs/applications/emulators')
-rw-r--r--pkgs/applications/emulators/dosbox-x/default.nix20
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 = [