Merge pull request #35389 from clefru/oath-fix

oath-toolkit: Switch over to git branch (GCC7 fix)

Changed files
+16 -6
pkgs
tools
security
oath-toolkit
top-level
+15 -5
pkgs/tools/security/oath-toolkit/default.nix
···
-
{ stdenv, fetchurl, pam, xmlsec }:
+
{ stdenv, fetchgit, pam, xmlsec, autoconf, automake, libtool, pkgconfig, libxml2, gtkdoc, perl, gengetopt, bison, help2man }:
let
securityDependency =
···
stdenv.mkDerivation rec {
name = "oath-toolkit-2.6.2";
-
src = fetchurl {
-
url = "mirror://savannah/oath-toolkit/${name}.tar.gz";
-
sha256 = "182ah8vfbg0yhv6mh1b6ap944d0na6x7lpfkwkmzb6jl9gx4cd5h";
+
src = fetchgit {
+
url = "https://gitlab.com/oath-toolkit/oath-toolkit.git";
+
sha256 = "0n2sl444723f1k0sjmc0mzdwslx51yxac39c2cx2bl3ykacgfv74";
+
rev = "0dffdec9c5af5c89a5af43add29d8275eefe7414";
};
+
buildInputs = [ securityDependency automake autoconf libtool pkgconfig libxml2 gtkdoc perl gengetopt bison help2man ];
-
buildInputs = [ securityDependency ];
+
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
+
'';
meta = {
homepage = http://www.nongnu.org/oath-toolkit/;
+1 -1
pkgs/top-level/all-packages.nix
···
nzbget = callPackage ../tools/networking/nzbget { };
-
oathToolkit = callPackage ../tools/security/oath-toolkit { };
+
oathToolkit = callPackage ../tools/security/oath-toolkit { inherit (gnome2) gtkdoc; };
obex_data_server = callPackage ../tools/bluetooth/obex-data-server { };