diff options
author | Alyssa Ross <hi@alyssa.is> | 2020-01-11 23:37:02 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2020-01-11 23:41:30 +0000 |
commit | 6c557e3f1c28cf87e9fba232811d6875dd1399c1 (patch) | |
tree | 035a071d5d8980df6de0fa42e2ef8fc0cce7055e /nixpkgs/pkgs/applications/graphics/feh/default.nix | |
parent | da7500bc026e937ac7fce7b50f67a0e1765737a7 (diff) | |
parent | e4134747f5666bcab8680aff67fa3b63384f9a0f (diff) | |
download | nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.tar nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.tar.gz nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.tar.bz2 nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.tar.lz nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.tar.xz nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.tar.zst nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.zip |
Merge commit 'e4134747f5666bcab8680aff67fa3b63384f9a0f'
Diffstat (limited to 'nixpkgs/pkgs/applications/graphics/feh/default.nix')
-rw-r--r-- | nixpkgs/pkgs/applications/graphics/feh/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/applications/graphics/feh/default.nix b/nixpkgs/pkgs/applications/graphics/feh/default.nix index fef068eaf0ff..1eb99a9a7e41 100644 --- a/nixpkgs/pkgs/applications/graphics/feh/default.nix +++ b/nixpkgs/pkgs/applications/graphics/feh/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, makeWrapper , xorg, imlib2, libjpeg, libpng -, curl, libexif, perlPackages }: +, curl, libexif, jpegexiforient, perlPackages }: with stdenv.lib; stdenv.mkDerivation rec { pname = "feh"; - version = "3.2.1"; + version = "3.3"; src = fetchurl { url = "https://feh.finalrewind.org/${pname}-${version}.tar.bz2"; - sha256 = "070axq8jpibcabmjfv4fmjmpk3k349vzvh4qhsi4n62bkcwl35wg"; + sha256 = "04c8cgwzkax481sz7lbzy23mk79bqmjy3qpvr7vxa4c14mc9k5gk"; }; outputs = [ "out" "man" "doc" ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { installTargets = [ "install" ]; postInstall = '' - wrapProgram "$out/bin/feh" --prefix PATH : "${libjpeg.bin}/bin" \ + wrapProgram "$out/bin/feh" --prefix PATH : "${makeBinPath [ libjpeg jpegexiforient ]}" \ --add-flags '--theme=feh' ''; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { description = "A light-weight image viewer"; homepage = "https://feh.finalrewind.org/"; license = licenses.mit; - maintainers = with maintainers; [ viric willibutz globin ]; + maintainers = with maintainers; [ viric willibutz globin ma27 ]; platforms = platforms.unix; }; } |