diff options
| author | Artturi <Artturin@artturin.com> | 2023-11-20 08:37:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-20 08:37:31 +0200 |
| commit | 6315a2afd42f198abb452105b5690aabc5317231 (patch) | |
| tree | af64ea9ef3dd87aea5cc437bd54dee5e5373f97c /pkgs/applications | |
| parent | 789d57c5cfc2468d6a306162b35c74f1c7a9e354 (diff) | |
| parent | d81ca2b405b195e8e40e015504f206a1b7c74e55 (diff) | |
Merge pull request #259649 from CharlzKlug/master
Fix for Feh's right-click buffer overflow crash
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/graphics/feh/default.nix | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index af41424d58c3c..16447ac6d4d71 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper +{ lib, stdenv, fetchFromGitHub, makeWrapper, fetchpatch , xorg, imlib2, libjpeg, libpng , curl, libexif, jpegexiforient, perl , enableAutoreload ? !stdenv.hostPlatform.isDarwin }: @@ -14,6 +14,15 @@ stdenv.mkDerivation rec { hash = "sha256-1dz04RcaoP79EoE+SsatXm2wMRCbNnmAzMECYk3y3jg="; }; + patches = [ + # upstream PR: https://github.com/derf/feh/pull/723 + (fetchpatch { + name = "fix-right-click-buffer-overflow.patch"; + url = "https://github.com/derf/feh/commit/2c31f8863b80030e772a529ade519fc2fee4a991.patch"; + sha256 = "sha256-sUWS06qt1d1AyGfqKb+1BzZslYxOzur4q0ePEHcTz1g="; + }) + ]; + outputs = [ "out" "man" "doc" ]; nativeBuildInputs = [ makeWrapper ]; |