Unverified Commit d7d0d9d8 authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

Merge pull request #281433 from gepbird/feh-3.10.2

feh: 3.10.1 -> 3.10.2
parents c60431f4 2dc76c4e
Loading
Loading
Loading
Loading
+25 −23
Original line number Diff line number Diff line
{ lib, stdenv, fetchFromGitHub, makeWrapper, fetchpatch
, xorg, imlib2, libjpeg, libpng
, curl, libexif, jpegexiforient, perl
, enableAutoreload ? !stdenv.hostPlatform.isDarwin }:

stdenv.mkDerivation rec {
{ lib
, stdenv
, fetchFromGitHub
, makeWrapper
, xorg
, imlib2
, libjpeg
, libpng
, curl
, libexif
, jpegexiforient
, perl
, enableAutoreload ? !stdenv.hostPlatform.isDarwin
}:

stdenv.mkDerivation (finalAttrs: {
  pname = "feh";
  version = "3.10.1";
  version = "3.10.2";

  src = fetchFromGitHub {
    owner = "derf";
    repo = pname;
    rev = version;
    hash = "sha256-1dz04RcaoP79EoE+SsatXm2wMRCbNnmAzMECYk3y3jg=";
    repo = "feh";
    rev = finalAttrs.version;
    hash = "sha256-378rhZhpcua3UbsY0OcGKGXdMIQCuG84YjJ9vfJhZVs=";
  };

  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 ];
@@ -30,7 +31,8 @@ stdenv.mkDerivation rec {
  buildInputs = [ xorg.libXt xorg.libX11 xorg.libXinerama imlib2 libjpeg libpng curl libexif ];

  makeFlags = [
    "PREFIX=${placeholder "out"}" "exif=1"
    "PREFIX=${placeholder "out"}"
    "exif=1"
  ] ++ lib.optional stdenv.isDarwin "verscmp=0"
  ++ lib.optional enableAutoreload "inotify=1";

@@ -49,8 +51,8 @@ stdenv.mkDerivation rec {
    # released under a variant of the MIT license
    # https://spdx.org/licenses/MIT-feh.html
    license = licenses.mit-feh;
    maintainers = with maintainers; [ viric willibutz globin ];
    maintainers = with maintainers; [ gepbird globin viric willibutz ];
    platforms = platforms.unix;
    mainProgram = "feh";
  };
}
})