alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #281433 from gepbird/feh-3.10.2

Browse source 
feh: 3.10.1 -> 3.10.2
This commit is contained in:
Nick Cao 2024-01-18 13:16:10 -05:00 committed by GitHub
parent c60431f4df 2dc76c4e81
commit d7d0d9d873
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 24 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
pkgs/applications/graphics/feh/default.nix
View file

@ -1,28 +1,29 @@
{ lib, stdenv, fetchFromGitHub, makeWrapper, fetchpatch
, xorg, imlib2, libjpeg, libpng
, curl, libexif, jpegexiforient, perl
, enableAutoreload ? !stdenv.hostPlatform.isDarwin }:
{ lib
, stdenv
, fetchFromGitHub
, makeWrapper
, xorg
, imlib2
, libjpeg
, libpng
, curl
, libexif
, jpegexiforient
, perl
, enableAutoreload ? !stdenv.hostPlatform.isDarwin
}:
stdenv.mkDerivation rec {
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,9 +31,10 @@ 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";
++ lib.optional enableAutoreload "inotify=1";
installTargets = [ "install" ];
postInstall = ''
@ -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";
};
}
})