fbv: 1.0b -> 1.0c

+13 -24
+13 -24
pkgs/by-name/fb/fbv/package.nix
··· 1 1 { 2 2 lib, 3 3 stdenv, 4 - fetchurl, 5 - fetchpatch, 4 + fetchFromGitHub, 6 5 getopt, 7 6 libjpeg, 8 7 libpng12, 9 - giflib, 10 8 }: 11 9 12 - stdenv.mkDerivation rec { 10 + stdenv.mkDerivation (finalAttrs: { 13 11 pname = "fbv"; 14 - version = "1.0b"; 12 + version = "1.0c"; 15 13 16 - src = fetchurl { 17 - url = "http://s-tech.elsat.net.pl/fbv/fbv-${version}.tar.gz"; 18 - sha256 = "0g5b550vk11l639y8p5sx1v1i6ihgqk0x1hd0ri1bc2yzpdbjmcv"; 14 + src = fetchFromGitHub { 15 + owner = "jstkdng"; 16 + repo = "fbv"; 17 + tag = finalAttrs.version; 18 + hash = "sha256-4tAIFklKsx2uI+FQjq9vdolYm6d6YWugioG6k2ZUMrs="; 19 19 }; 20 20 21 - patches = [ 22 - (fetchpatch { 23 - url = "https://raw.githubusercontent.com/void-linux/void-packages/4a5bfe522ea5afd8203e804dc6a642d0871cd6dd/srcpkgs/fbv/patches/giflib-5.1.patch"; 24 - sha256 = "00q1zcn92yvvyij68bnq0m1sr3a411w914f4nyp6mpz0j5xc6dc7"; 25 - }) 26 - ]; 27 - 28 - patchFlags = [ "-p0" ]; 29 - 30 21 buildInputs = [ 31 22 getopt 32 23 libjpeg 33 24 libpng12 34 - giflib 35 25 ]; 36 - makeFlags = [ "LDFLAGS=-lgif" ]; 37 26 38 27 enableParallelBuilding = true; 39 28 ··· 41 30 mkdir -p $out/{bin,man/man1} 42 31 ''; 43 32 44 - meta = with lib; { 33 + meta = { 45 34 description = "View pictures on a linux framebuffer device"; 46 - homepage = "http://s-tech.elsat.net.pl/fbv/"; 47 - license = licenses.gpl2Only; 48 - maintainers = with maintainers; [ peterhoeg ]; 35 + homepage = "https://github.com/jstkdng/fbv"; 36 + license = lib.licenses.gpl2Only; 37 + maintainers = with lib.maintainers; [ peterhoeg ]; 49 38 mainProgram = "fbv"; 50 39 }; 51 - } 40 + })