JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #35389 from clefru/oath-fix

Browse Source 
oath-toolkit: Switch over to git branch (GCC7 fix)
This commit is contained in:
Jörg Thalheim 2018-02-23 11:00:13 +00:00 committed by GitHub
commit 33115bde4b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/tools/security/oath-toolkit/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pam, xmlsec }:
{ stdenv, fetchgit, pam, xmlsec, autoconf, automake, libtool, pkgconfig, libxml2, gtkdoc, perl, gengetopt, bison, help2man }:
let
securityDependency =
@ -8,13 +8,23 @@ in
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/;

2
pkgs/top-level/all-packages.nix
View File

@ -3895,7 +3895,7 @@ with pkgs;
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 { };