diff options
author | Nick Cao <nickcao@nichi.co> | 2024-01-18 13:16:10 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-01-18 13:16:10 -0500 |
commit | d7d0d9d87374b7f786018c74abc24299290894c6 (patch) | |
tree | 7a98a8aec54b2d91248360b78025503c4950d2b9 /pkgs | |
parent | c60431f4df2300f139e53b4c57c91034875a4843 (diff) | |
parent | 2dc76c4e8150ce5c8351c963bc908f4bd2e5f0c8 (diff) |
Merge pull request #281433 from gepbird/feh-3.10.2
feh: 3.10.1 -> 3.10.2
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/graphics/feh/default.nix | 48 |
1 files changed, 25 insertions, 23 deletions
diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index 16447ac6d4d71..de43122b9080c 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -1,28 +1,29 @@ -{ 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,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"; }; -} +}) |