diff options
| author | Vladimír Čunát <v@cunat.cz> | 2023-11-16 22:03:50 +0100 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2023-11-16 22:03:50 +0100 |
| commit | 391aafc3d6b17ed5517795eb8b9c41ed7c6082e3 (patch) | |
| tree | 593549e236bd3937935118b5ad80519099e246c8 | |
| parent | dba5c9ef4ed32157e57d2e00ab19be3263cc63c9 (diff) | |
| parent | c4c7e6764f8f56f46a87c8e32fbf462be0f836e8 (diff) | |
| download | nixpkgs-391aafc3d6b17ed5517795eb8b9c41ed7c6082e3.tar nixpkgs-391aafc3d6b17ed5517795eb8b9c41ed7c6082e3.tar.gz nixpkgs-391aafc3d6b17ed5517795eb8b9c41ed7c6082e3.tar.bz2 nixpkgs-391aafc3d6b17ed5517795eb8b9c41ed7c6082e3.tar.lz nixpkgs-391aafc3d6b17ed5517795eb8b9c41ed7c6082e3.tar.xz nixpkgs-391aafc3d6b17ed5517795eb8b9c41ed7c6082e3.tar.zst nixpkgs-391aafc3d6b17ed5517795eb8b9c41ed7c6082e3.zip | |
Merge #266756: dosbox: fix build with clang 16
...into staging-next
| -rw-r--r-- | pkgs/applications/emulators/dosbox/default.nix | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/pkgs/applications/emulators/dosbox/default.nix b/pkgs/applications/emulators/dosbox/default.nix index 4a6d229762b..d0c9d8450e2 100644 --- a/pkgs/applications/emulators/dosbox/default.nix +++ b/pkgs/applications/emulators/dosbox/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , autoreconfHook , SDL , SDL_net @@ -23,6 +24,14 @@ stdenv.mkDerivation rec { hash = "sha256-wNE91+0u02O2jeYVR1eB6JHNWC6BYrXDZpE3UCIiJgo="; }; + patches = [ + (fetchpatch { + url = "https://github.com/joncampbell123/dosbox-x/commit/006d5727d36d1ec598e387f2f1a3c521e3673dcb.patch"; + includes = [ "src/gui/render_templates_sai.h" ]; + hash = "sha256-HSO29/LgZRKQ3HQBA0QF5henG8pCSoe1R2joYNPcUcE="; + }) + ]; + nativeBuildInputs = [ autoreconfHook copyDesktopItems |