dillo: refactor

- fix version string
- strictDeps
- split outputs
- no nested with

authored by Anderson Torres and committed by Francesco Gazzetta dc675957 d210f6bc

+31 -22
+31 -22
pkgs/by-name/di/dillo/package.nix
··· 1 - { lib 2 - , stdenv 3 - , fetchhg 4 - , autoreconfHook 5 - , fltk 6 - , libXcursor 7 - , libXi 8 - , libXinerama 9 - , libjpeg 10 - , libpng 11 - , mbedtls_2 12 - , openssl 13 - , perl 14 - , pkg-config 15 - , which 1 + { 2 + lib, 3 + autoreconfHook, 4 + fetchhg, 5 + fltk, 6 + libXcursor, 7 + libXi, 8 + libXinerama, 9 + libjpeg, 10 + libpng, 11 + mbedtls_2, 12 + openssl, 13 + perl, 14 + pkg-config, 15 + stdenv, 16 + which, 16 17 }: 17 18 18 19 stdenv.mkDerivation { 19 20 pname = "dillo"; 20 - version = "unstable-2021-02-09"; 21 + version = "3.0.5-unstable-2021-02-09"; 21 22 22 23 src = fetchhg { 23 24 url = "https://hg.sr.ht/~seirdy/dillo-mirror"; 24 25 rev = "67b70f024568b505633524be61fcfbde5337849f"; 25 - sha256 = "sha256-lbn5u9oEL0zt9yBhznBS9Dz9/6kSwRDJeNXKEojty1g="; 26 + hash = "sha256-lbn5u9oEL0zt9yBhznBS9Dz9/6kSwRDJeNXKEojty1g="; 26 27 }; 27 28 28 29 nativeBuildInputs = [ 29 30 autoreconfHook 30 31 pkg-config 32 + fltk 31 33 which 32 34 ]; 33 35 ··· 43 45 perl 44 46 ]; 45 47 48 + outputs = [ "out" "doc" "man" ]; 49 + 50 + configureFlags = [ 51 + (lib.enableFeature true "ssl") 52 + ]; 53 + 46 54 # Workaround build failure on -fno-common toolchains: 47 55 # ld: main.o:/build/dillo-3.0.5/dpid/dpid.h:64: multiple definition of `sock_set'; 48 56 # dpid.o:/build/dillo-3.0.5/dpid/dpid.h:64: first defined here 49 57 env.NIX_CFLAGS_COMPILE = "-fcommon"; 50 58 51 - configureFlags = [ "--enable-ssl=yes" ]; 59 + strictDeps = true; 52 60 53 - meta = with lib; { 61 + meta = { 54 62 homepage = "https://hg.sr.ht/~seirdy/dillo-mirror"; 55 63 description = "A fast graphical web browser with a small footprint"; 56 64 longDescription = '' 57 65 Dillo is a small, fast web browser, tailored for older machines. 58 66 ''; 59 - maintainers = [ maintainers.AndersonTorres ]; 60 - platforms = platforms.linux; 61 - license = licenses.gpl3Plus; 67 + mainProgram = "dillo"; 68 + maintainers = with lib.maintainers; [ AndersonTorres ]; 69 + license = lib.licenses.gpl3Plus; 70 + platforms = lib.platforms.linux; 62 71 }; 63 72 }