Merge pull request #15020 from sheenobu/freeradius/bugfix/checkrad_paths

freeradius: fix checkrad paths by providing perl, finger substitution
This commit is contained in:
Joachim Fasting 2016-04-29 01:32:01 +02:00
commit 8e1a1baf33
1 changed files with 6 additions and 2 deletions

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, autoreconfHook, talloc { stdenv, fetchurl, autoreconfHook, talloc, finger_bsd, perl
, openssl , openssl
, linkOpenssl? true , linkOpenssl? true
, openldap , openldap
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
name = "freeradius-${version}"; name = "freeradius-${version}";
version = "3.0.11"; version = "3.0.11";
buildInputs = [ autoreconfHook openssl talloc ] buildInputs = [ autoreconfHook openssl talloc finger_bsd perl ]
++ optional withLdap [ openldap ] ++ optional withLdap [ openldap ]
++ optional withSqlite [ sqlite ] ++ optional withSqlite [ sqlite ]
++ optional withPcap [ libpcap ] ++ optional withPcap [ libpcap ]
@ -60,6 +60,10 @@ stdenv.mkDerivation rec {
"--localstatedir=/var" "--localstatedir=/var"
] ++ optional (!linkOpenssl) "--with-openssl=no"; ] ++ optional (!linkOpenssl) "--with-openssl=no";
postPatch = ''
substituteInPlace src/main/checkrad.in --replace "/usr/bin/finger" "${finger_bsd}/bin/finger"
'';
installFlags = [ installFlags = [
"sysconfdir=\${out}/etc" "sysconfdir=\${out}/etc"
"localstatedir=\${TMPDIR}" "localstatedir=\${TMPDIR}"