From cd94a00aa7447246854fcc859cb07b59d2a73d36 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 5 Jul 2023 21:03:45 +0200 Subject: stoken: Clean up - Format the expression. - Use static repo name. - Use autoreconfHook. --- pkgs/tools/security/stoken/default.nix | 38 ++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 15 deletions(-) (limited to 'pkgs/tools/security/stoken') diff --git a/pkgs/tools/security/stoken/default.nix b/pkgs/tools/security/stoken/default.nix index 04e47dcb84098..7d3709ed2f378 100644 --- a/pkgs/tools/security/stoken/default.nix +++ b/pkgs/tools/security/stoken/default.nix @@ -1,30 +1,38 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config -, libxml2, nettle -, withGTK3 ? true, gtk3 }: +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, pkg-config +, libxml2 +, nettle +, withGTK3 ? true +, gtk3 +}: stdenv.mkDerivation rec { pname = "stoken"; version = "0.92"; + src = fetchFromGitHub { owner = "cernekee"; - repo = pname; + repo = "stoken"; rev = "v${version}"; sha256 = "0q7cv8vy5b2cslm57maqb6jsm7s4rwacjyv6gplwp26yhm38hw7y"; }; - preConfigure = '' - aclocal - libtoolize --automake --copy - autoheader - automake --add-missing --copy - autoconf - ''; - strictDeps = true; - nativeBuildInputs = [ pkg-config autoconf automake libtool ]; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + buildInputs = [ - libxml2 nettle - ] ++ lib.optional withGTK3 gtk3; + libxml2 + nettle + ] ++ lib.optionals withGTK3 [ + gtk3 + ]; meta = with lib; { description = "Software Token for Linux/UNIX"; -- cgit 1.4.1