From fffd3c4c41524d03ac0f14b60cf8a8172d8c72d9 Mon Sep 17 00:00:00 2001 From: Vladyslav M Date: Sun, 4 Mar 2018 16:17:12 +0200 Subject: [PATCH] feh: 2.24 -> 2.25 --- pkgs/applications/graphics/feh/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index 6d603f6940b..61e177be609 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -6,11 +6,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "feh-${version}"; - version = "2.24"; + version = "2.25"; src = fetchurl { url = "https://feh.finalrewind.org/${name}.tar.bz2"; - sha256 = "148qbxkk5m7i3cxymnfwi7aikqjyfxr306dlqm9ndp6x932js5wq"; + sha256 = "102rwi30n09l8rih6kv6bb7lhv3djklgzill4p2zag0h700yqfq6"; }; outputs = [ "out" "man" "doc" ]; @@ -20,9 +20,9 @@ stdenv.mkDerivation rec { buildInputs = [ xorg.libX11 xorg.libXinerama imlib2 libjpeg libpng curl libexif ]; - preBuild = '' - makeFlags="PREFIX=$out exif=1" - ''; + makeFlags = [ + "PREFIX=$(out)" "exif=1" + ] ++ optional stdenv.isDarwin "verscmp=0"; postBuild = '' pushd man