Merge pull request #259649 from CharlzKlug/master

Fix for Feh's right-click buffer overflow crash

authored by

Artturi and committed by
GitHub
6315a2af 789d57c5

+10 -1
+10 -1
pkgs/applications/graphics/feh/default.nix
··· 1 - { lib, stdenv, fetchFromGitHub, makeWrapper 1 + { lib, stdenv, fetchFromGitHub, makeWrapper, fetchpatch 2 2 , xorg, imlib2, libjpeg, libpng 3 3 , curl, libexif, jpegexiforient, perl 4 4 , enableAutoreload ? !stdenv.hostPlatform.isDarwin }: ··· 13 13 rev = version; 14 14 hash = "sha256-1dz04RcaoP79EoE+SsatXm2wMRCbNnmAzMECYk3y3jg="; 15 15 }; 16 + 17 + patches = [ 18 + # upstream PR: https://github.com/derf/feh/pull/723 19 + (fetchpatch { 20 + name = "fix-right-click-buffer-overflow.patch"; 21 + url = "https://github.com/derf/feh/commit/2c31f8863b80030e772a529ade519fc2fee4a991.patch"; 22 + sha256 = "sha256-sUWS06qt1d1AyGfqKb+1BzZslYxOzur4q0ePEHcTz1g="; 23 + }) 24 + ]; 16 25 17 26 outputs = [ "out" "man" "doc" ]; 18 27