summary refs log tree commit diff
path: root/pkgs/applications/graphics/feh
diff options
context:
space:
mode:
authorVladyslav M <dywedir@protonmail.ch>2018-03-04 16:17:12 +0200
committerobadz <obadz-git@obadz.com>2018-03-04 17:04:04 +0000
commitfffd3c4c41524d03ac0f14b60cf8a8172d8c72d9 (patch)
tree97d2e8a4159f81748732bb4692976669ec3ea289 /pkgs/applications/graphics/feh
parent7b056a3330d7ad013d1183a95f94d82dfac2d5c6 (diff)
downloadnixlib-fffd3c4c41524d03ac0f14b60cf8a8172d8c72d9.tar
nixlib-fffd3c4c41524d03ac0f14b60cf8a8172d8c72d9.tar.gz
nixlib-fffd3c4c41524d03ac0f14b60cf8a8172d8c72d9.tar.bz2
nixlib-fffd3c4c41524d03ac0f14b60cf8a8172d8c72d9.tar.lz
nixlib-fffd3c4c41524d03ac0f14b60cf8a8172d8c72d9.tar.xz
nixlib-fffd3c4c41524d03ac0f14b60cf8a8172d8c72d9.tar.zst
nixlib-fffd3c4c41524d03ac0f14b60cf8a8172d8c72d9.zip
feh: 2.24 -> 2.25
Diffstat (limited to 'pkgs/applications/graphics/feh')
-rw-r--r--pkgs/applications/graphics/feh/default.nix10
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix
index 6d603f6940bb..61e177be6093 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