diff options
author | Maximilian Bosch <maximilian@mbosch.me> | 2022-07-09 20:36:40 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-07-09 20:36:40 +0200 |
commit | 81678b0f59e9b76f336672e78501531e8311dc04 (patch) | |
tree | 8e00131b6d2d9c3717ea92c10c776d47cae0ccd3 | |
parent | 63ada1dc42705505d136625bd75dbdfca3d7df17 (diff) | |
parent | 7d69cd5908e92862e449b53509e0d3b9bd07b3b8 (diff) |
Merge pull request #180870 from kilianar/feh
feh: 3.8 -> 3.9
-rw-r--r-- | pkgs/applications/graphics/feh/default.nix | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index 9c75742d52ba3..3865848ff209d 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -1,17 +1,27 @@ -{ lib, stdenv, fetchurl, makeWrapper -, xorg, imlib2, libjpeg, libpng +{ lib, stdenv, fetchFromGitHub, makeWrapper +, xorg, imlib2, libjpeg, libpng, fetchpatch , curl, libexif, jpegexiforient, perl , enableAutoreload ? !stdenv.hostPlatform.isDarwin }: stdenv.mkDerivation rec { pname = "feh"; - version = "3.8"; + version = "3.9"; - src = fetchurl { - url = "https://feh.finalrewind.org/${pname}-${version}.tar.bz2"; - sha256 = "1a9bsq5j9sl2drzkab0hdhnamalpaszw9mz2prz6scrr5dak8g3z"; + src = fetchFromGitHub { + owner = "derf"; + repo = pname; + rev = version; + sha256 = "sha256-rgNC4M1TJ5EPeWmVHVzgaxTGLY7CYQf7uOsOn5bkwKE="; }; + patches = [ + # fix test failure when magic=0 is set + (fetchpatch { + url = "https://github.com/derf/feh/commit/3c1076b31e2e4e3429a5c3d334d555e549fb72d2.patch"; + sha256 = "sha256-F9N+N/BAeclyPHQYlO9ZV1U8S1VWfHl/8dMKUqA7DF8="; + }) + ]; + outputs = [ "out" "man" "doc" ]; nativeBuildInputs = [ makeWrapper xorg.libXt ]; |