Merge pull request #259649 from CharlzKlug/master

Fix for Feh's right-click buffer overflow crash
This commit is contained in:
Artturi 2023-11-20 08:37:31 +02:00 committed by GitHub
commit 6315a2afd4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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 ];