diff options
| author | Sage Raflik <neonfuz@gmail.com> | 2020-07-03 17:24:09 -0500 |
|---|---|---|
| committer | Daniël de Kok <me@danieldk.eu> | 2020-07-05 20:09:32 +0200 |
| commit | 2d24b8b187965fa13922be5c9c2994a81879094c (patch) | |
| tree | 0d2f9ff33efd240ff302678421e2976ea70f2571 | |
| parent | b63e659a72ee3ea6abefec8800390ad4d12f0d2f (diff) | |
crispyDoom: fixed CVE-2020-14983
| -rw-r--r-- | pkgs/games/crispy-doom/default.nix | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/pkgs/games/crispy-doom/default.nix b/pkgs/games/crispy-doom/default.nix index ea7c3c6e4784..5bd6e714e427 100644 --- a/pkgs/games/crispy-doom/default.nix +++ b/pkgs/games/crispy-doom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoreconfHook, pkgconfig, SDL2, SDL2_mixer, SDL2_net, fetchFromGitHub }: +{ stdenv, autoreconfHook, pkgconfig, SDL2, SDL2_mixer, SDL2_net, fetchFromGitHub, fetchpatch }: stdenv.mkDerivation rec { pname = "crispy-doom"; @@ -11,6 +11,18 @@ stdenv.mkDerivation rec { sha256 = "1b6gn0dysv631jynh769whww9xcss1gms78sz3nrn855q1dsvcb4"; }; + patches = [ + # Fixes CVE-2020-14983 + (fetchpatch { + url = "https://github.com/chocolate-doom/chocolate-doom/commit/f1a8d991aa8a14afcb605cf2f65cd15fda204c56.diff"; + sha256 = "1z6pxg9azcqq7g09hjc09d01knd803nhqilkw2kbx8648hil9mgn"; + }) + (fetchpatch { + url = "https://github.com/chocolate-doom/chocolate-doom/commit/54fb12eeaa7d527defbe65e7e00e37d5feb7c597.diff"; + sha256 = "0ww21jn02ld73rkp06f7fqy92jqv8c9q4d1mvsryag1gmvy57znj"; + }) + ]; + postPatch = '' sed -e 's#/games#/bin#g' -i src{,/setup}/Makefile.am ''; |