From 9d941bcd7b7284616c36f71e2f23c7e1bc67b2f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Wed, 26 Aug 2020 08:41:04 +0200 Subject: [PATCH] fossil: install man page and bash shell completions While at it, clean the derivation up a little. --- .../version-management/fossil/default.nix | 38 ++++++++++++------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index d23728a060f..4135964d76e 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -1,6 +1,16 @@ { stdenv -, libiconv, fetchurl, zlib, openssl, tcl, readline, sqlite, ed, which -, tcllib, withJson ? true +, installShellFiles +, tcl +, libiconv +, fetchurl +, zlib +, openssl +, readline +, sqlite +, ed +, which +, tcllib +, withJson ? true }: stdenv.mkDerivation rec { @@ -16,26 +26,32 @@ stdenv.mkDerivation rec { sha256 = "1sxq1hn87fdikhbg9y3v4sjy4gxaifnx4dig8nx6xwd5mm7z74dk"; }; + nativeBuildInputs = [ installShellFiles tcl ]; + buildInputs = [ zlib openssl readline sqlite which ed ] - ++ stdenv.lib.optional stdenv.isDarwin libiconv; - nativeBuildInputs = [ tcl ]; + ++ stdenv.lib.optional stdenv.isDarwin libiconv; doCheck = stdenv.hostPlatform == stdenv.buildPlatform; + + configureFlags = stdenv.lib.optional withJson "--json"; + preCheck = '' export TCLLIBPATH="${tcllib}/lib/tcllib${tcllib.version}" ''; - configureFlags = stdenv.lib.optional withJson "--json"; - preBuild='' + preBuild = '' export USER=nonexistent-but-specified-user ''; installPhase = '' mkdir -p $out/bin INSTALLDIR=$out/bin make install + + installManPage fossil.1 + installShellCompletion --name fossil.bash tools/fossil-autocomplete.bash ''; - meta = { + meta = with stdenv.lib; { description = "Simple, high-reliability, distributed software configuration management"; longDescription = '' Fossil is a software configuration management system. Fossil is @@ -45,11 +61,7 @@ stdenv.mkDerivation rec { from the others by being extremely simple to setup and operate. ''; homepage = "http://www.fossil-scm.org/"; - license = stdenv.lib.licenses.bsd2; - platforms = with stdenv.lib.platforms; all; - maintainers = [ #Add your name here! - stdenv.lib.maintainers.maggesi - stdenv.lib.maintainers.viric - ]; + license = licenses.bsd2; + maintainers = with maintainers; [ maggesi viric ]; }; }