From 7307f5c01154df0ab5448d20efb2cfa84fc3e267 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 13 Aug 2015 14:18:36 +0200 Subject: [PATCH] stoken: fix evaluation (licence), refactor a little I hope @fuuzetsu doesn't mind the refactoring. BTW, do you know about `autoreconfHook`? It might save the preConfigure and most buildInputs. --- pkgs/tools/security/stoken/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/security/stoken/default.nix b/pkgs/tools/security/stoken/default.nix index 769c67991913..17652e220da6 100644 --- a/pkgs/tools/security/stoken/default.nix +++ b/pkgs/tools/security/stoken/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { buildInputs = [ autoconf automake libtool pkgconfig libxml2 nettle - ] ++ (if withGTK3 then [ gtk3 ] else []); + ] ++ stdenv.lib.optional withGTK3 gtk3; - meta = { + meta = with stdenv.lib; { description = "Software Token for Linux/UNIX"; homepage = https://github.com/cernekee/stoken; - license = stdenv.lib.license.lgpl21Plus; - maintainers = [ stdenv.lib.maintainers.fuuzetsu ]; - platforms = stdenv.lib.platforms.all; + license = licenses.lgpl21Plus; + maintainers = [ maintainers.fuuzetsu ]; + platforms = platforms.all; }; }