forked from DGNum/liminix
upgrade to ppp 2.5.0
This commit is contained in:
parent
3f6585f6be
commit
339c2d9873
3 changed files with 42 additions and 1 deletions
|
@ -174,7 +174,7 @@ extraPkgs // {
|
||||||
});
|
});
|
||||||
|
|
||||||
pppBuild = prev.ppp;
|
pppBuild = prev.ppp;
|
||||||
ppp =
|
pppOld =
|
||||||
(prev.ppp.override {
|
(prev.ppp.override {
|
||||||
libpcap = null;
|
libpcap = null;
|
||||||
}).overrideAttrs (o : {
|
}).overrideAttrs (o : {
|
||||||
|
|
|
@ -16,6 +16,7 @@
|
||||||
s6-init-bin = callPackage ./s6-init-bin {};
|
s6-init-bin = callPackage ./s6-init-bin {};
|
||||||
s6-rc-database = callPackage ./s6-rc-database {};
|
s6-rc-database = callPackage ./s6-rc-database {};
|
||||||
mips-vm = callPackage ./mips-vm {};
|
mips-vm = callPackage ./mips-vm {};
|
||||||
|
ppp = callPackage ./ppp {};
|
||||||
pppoe = callPackage ./pppoe {};
|
pppoe = callPackage ./pppoe {};
|
||||||
|
|
||||||
kernel-backport = callPackage ./kernel-backport {};
|
kernel-backport = callPackage ./kernel-backport {};
|
||||||
|
|
40
pkgs/ppp/default.nix
Normal file
40
pkgs/ppp/default.nix
Normal file
|
@ -0,0 +1,40 @@
|
||||||
|
{
|
||||||
|
fetchFromGitHub
|
||||||
|
, stdenv
|
||||||
|
, autoreconfHook
|
||||||
|
, substituteAll
|
||||||
|
# , openssl
|
||||||
|
}: stdenv.mkDerivation {
|
||||||
|
pname = "ppp";
|
||||||
|
version = "2.5.0";
|
||||||
|
nativeBuildInputs = [ autoreconfHook ];
|
||||||
|
# buildInputs= [ openssl ];
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
repo = "ppp";
|
||||||
|
owner = "ppp-project";
|
||||||
|
rev = "ppp-2.5.0";
|
||||||
|
hash = "sha256-J7udiLiJiJ1PzNxD+XYAUPXZ+ABGXt2U3hSFUWJXe94=";
|
||||||
|
};
|
||||||
|
|
||||||
|
configureFlags = [
|
||||||
|
"--disable-eaptls"
|
||||||
|
"--disable-peap"
|
||||||
|
"--disable-openssl-engine"
|
||||||
|
"--without-openssl"
|
||||||
|
];
|
||||||
|
|
||||||
|
postPatch = ''
|
||||||
|
sed -i.bak pppd/crypto_ms.c -e '/#include <openssl\/evp.h>/d'
|
||||||
|
sed -i.bak pppd/ppp-sha1.c -e 's/u_int32_t/uint32_t/g' -e '1i#include <stdint.h>'
|
||||||
|
'';
|
||||||
|
|
||||||
|
outputs = [
|
||||||
|
"bin"
|
||||||
|
"out"
|
||||||
|
"man"
|
||||||
|
"dev"
|
||||||
|
];
|
||||||
|
|
||||||
|
|
||||||
|
}
|
Loading…
Reference in a new issue