5 files changed, 31 insertions, 26 deletions
diff --git a/pkgs/tools/security/fprintd/default.nix b/pkgs/tools/security/fprintd/default.nix
index 727fc1ccb8e..effdaaecb18 100644
--- a/pkgs/tools/security/fprintd/default.nix
+++ b/pkgs/tools/security/fprintd/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, intltool
-, libfprint, glib, dbus_glib, polkit, nss, pam, systemd }:
+, libfprint, glib, dbus-glib, polkit, nss, pam, systemd }:
 
 stdenv.mkDerivation rec {
   name = "fprintd-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "05915i0bv7q62fqrs5diqwr8dz3pwqa1c1ivcgggkjyw0xk4ldp5";
   };
 
-  buildInputs = [ libfprint glib dbus_glib polkit nss pam systemd ];
+  buildInputs = [ libfprint glib dbus-glib polkit nss pam systemd ];
   nativeBuildInputs = [ pkgconfig intltool ];
 
   configureFlags = [ "--with-systemdsystemunitdir=$(out)/lib/systemd/system" ];
diff --git a/pkgs/tools/security/gencfsm/default.nix b/pkgs/tools/security/gencfsm/default.nix
index 51fff4c59ec..7f6f28593d2 100644
--- a/pkgs/tools/security/gencfsm/default.nix
+++ b/pkgs/tools/security/gencfsm/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, autoconf, automake, intltool, libtool, pkgconfig, encfs
-, glib , gnome3, gtk3, libgnome_keyring, vala, wrapGAppsHook, xorg
+, glib , gnome3, gtk3, libgnome-keyring, vala, wrapGAppsHook, xorg
 }:
 
 stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ autoconf automake intltool libtool vala glib encfs
-    gtk3 libgnome_keyring gnome3.libgee xorg.libSM xorg.libICE
+    gtk3 libgnome-keyring gnome3.libgee xorg.libSM xorg.libICE
     wrapGAppsHook ];
 
   patches = [ ./makefile-mkdir.patch ];
diff --git a/pkgs/tools/security/oath-toolkit/default.nix b/pkgs/tools/security/oath-toolkit/default.nix
index e41ca6f0501..9bd3f372672 100644
--- a/pkgs/tools/security/oath-toolkit/default.nix
+++ b/pkgs/tools/security/oath-toolkit/default.nix
@@ -1,34 +1,39 @@
-{ stdenv, fetchgit, pam, xmlsec, autoconf, automake, libtool, pkgconfig, libxml2, gtkdoc, perl, gengetopt, bison, help2man }:
+{ stdenv, fetchFromGitLab, pam, xmlsec, autoreconfHook, pkgconfig, libxml2, gtkdoc, perl, gengetopt, bison, help2man }:
 
 let
   securityDependency =
     if stdenv.isDarwin then xmlsec
     else pam;
-in
-stdenv.mkDerivation rec {
+
+in stdenv.mkDerivation rec {
   name = "oath-toolkit-2.6.2";
 
-  src = fetchgit {
-    url = "https://gitlab.com/oath-toolkit/oath-toolkit.git";
-    sha256 = "0n2sl444723f1k0sjmc0mzdwslx51yxac39c2cx2bl3ykacgfv74";
+  src = fetchFromGitLab {
+    owner = "oath-toolkit";
+    repo = "oath-toolkit";
     rev = "0dffdec9c5af5c89a5af43add29d8275eefe7414";
+    sha256 = "0n2sl444723f1k0sjmc0mzdwslx51yxac39c2cx2bl3ykacgfv74";
   };
 
-  buildInputs = [ securityDependency automake autoconf libtool pkgconfig libxml2 gtkdoc perl gengetopt bison help2man ];
+  buildInputs = [ securityDependency libxml2 perl gengetopt bison ];
+
+  nativeBuildInputs = [ autoreconfHook gtkdoc help2man pkgconfig ];
+
+  # man file generation fails when true
+  enableParallelBuilding = false;
 
   configureFlags = [ "--disable-pskc" ];
 
-  preConfigure = ''
-     # Replicate the steps from cfg.mk
-     printf "gdoc_MANS =\ngdoc_TEXINFOS =\n" > liboath/man/Makefile.gdoc
-     printf "gdoc_MANS =\ngdoc_TEXINFOS =\n" > libpskc/man/Makefile.gdoc
-     touch ChangeLog
-     autoreconf --force --install
+  # Replicate the steps from cfg.mk
+  preAutoreconf = ''
+    printf "gdoc_MANS =\ngdoc_TEXINFOS =\n" > liboath/man/Makefile.gdoc
+    printf "gdoc_MANS =\ngdoc_TEXINFOS =\n" > libpskc/man/Makefile.gdoc
+    touch ChangeLog
   '';
 
-  meta = {
-    homepage = http://www.nongnu.org/oath-toolkit/;
+  meta = with stdenv.lib; {
     description = "Components for building one-time password authentication systems";
-    platforms = with stdenv.lib.platforms; linux ++ darwin;
+    homepage = http://www.nongnu.org/oath-toolkit/;
+    platforms = with platforms; linux ++ darwin;
   };
 }
diff --git a/pkgs/tools/security/qdigidoc/default.nix b/pkgs/tools/security/qdigidoc/default.nix
index 87c9fc59a5b..8d520f90c65 100644
--- a/pkgs/tools/security/qdigidoc/default.nix
+++ b/pkgs/tools/security/qdigidoc/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, cmake, ccid, qttools, qttranslations, pkgconfig, pcsclite
-, hicolor_icon_theme, libdigidocpp, opensc, shared_mime_info, openldap
-, gettext, desktop_file_utils, makeWrapper }:
+, hicolor-icon-theme, libdigidocpp, opensc, shared-mime-info, openldap
+, gettext, desktop-file-utils, makeWrapper }:
 
 stdenv.mkDerivation rec {
 
@@ -27,8 +27,8 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ cmake ccid qttools pcsclite qttranslations
-                  hicolor_icon_theme libdigidocpp opensc shared_mime_info
-                  openldap gettext desktop_file_utils makeWrapper
+                  hicolor-icon-theme libdigidocpp opensc shared-mime-info
+                  openldap gettext desktop-file-utils makeWrapper
                 ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/tools/security/qesteidutil/default.nix b/pkgs/tools/security/qesteidutil/default.nix
index f99a9b6e556..0c6d15e7d77 100644
--- a/pkgs/tools/security/qesteidutil/default.nix
+++ b/pkgs/tools/security/qesteidutil/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, fetchpatch
 , cmake, ccid, qttools, qttranslations
-, pkgconfig, pcsclite, hicolor_icon_theme 
+, pkgconfig, pcsclite, hicolor-icon-theme 
 }:
 
 stdenv.mkDerivation rec {
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ cmake ccid qttools pcsclite qttranslations
-                  hicolor_icon_theme
+                  hicolor-icon-theme
                 ];
   
   meta = with stdenv.lib; {