feh: switch to finalAttrs pattern and format

gepbird.tngl.sh 73b6c4ae 34afff7c

verified
+21 -10
+21 -10
pkgs/applications/graphics/feh/default.nix
··· 1 - { lib, stdenv, fetchFromGitHub, makeWrapper 2 - , xorg, imlib2, libjpeg, libpng 3 - , curl, libexif, jpegexiforient, perl 4 - , enableAutoreload ? !stdenv.hostPlatform.isDarwin }: 1 + { lib 2 + , stdenv 3 + , fetchFromGitHub 4 + , makeWrapper 5 + , xorg 6 + , imlib2 7 + , libjpeg 8 + , libpng 9 + , curl 10 + , libexif 11 + , jpegexiforient 12 + , perl 13 + , enableAutoreload ? !stdenv.hostPlatform.isDarwin 14 + }: 5 15 6 - stdenv.mkDerivation rec { 16 + stdenv.mkDerivation (finalAttrs: { 7 17 pname = "feh"; 8 18 version = "3.10.2"; 9 19 10 20 src = fetchFromGitHub { 11 21 owner = "derf"; 12 - repo = pname; 13 - rev = version; 22 + repo = "feh"; 23 + rev = finalAttrs.version; 14 24 hash = "sha256-378rhZhpcua3UbsY0OcGKGXdMIQCuG84YjJ9vfJhZVs="; 15 25 }; 16 26 ··· 21 31 buildInputs = [ xorg.libXt xorg.libX11 xorg.libXinerama imlib2 libjpeg libpng curl libexif ]; 22 32 23 33 makeFlags = [ 24 - "PREFIX=${placeholder "out"}" "exif=1" 34 + "PREFIX=${placeholder "out"}" 35 + "exif=1" 25 36 ] ++ lib.optional stdenv.isDarwin "verscmp=0" 26 - ++ lib.optional enableAutoreload "inotify=1"; 37 + ++ lib.optional enableAutoreload "inotify=1"; 27 38 28 39 installTargets = [ "install" ]; 29 40 postInstall = '' ··· 44 55 platforms = platforms.unix; 45 56 mainProgram = "feh"; 46 57 }; 47 - } 58 + })