mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-18 19:54:05 +00:00
rpPPPoE: 3.12 -> 4.0 (#349480)
This commit is contained in:
commit
d641ace370
@ -5584,6 +5584,12 @@
|
||||
githubId = 15774340;
|
||||
name = "Thomas Depierre";
|
||||
};
|
||||
DictXiong = {
|
||||
email = "me@beardic.cn";
|
||||
github = "DictXiong";
|
||||
githubId = 41772157;
|
||||
name = "Dict Xiong";
|
||||
};
|
||||
diegolelis = {
|
||||
email = "diego.o.lelis@gmail.com";
|
||||
github = "DiegoLelis";
|
||||
|
@ -1,13 +1,15 @@
|
||||
{ lib, stdenv, fetchurl, ppp } :
|
||||
{ lib, stdenv, fetchFromGitHub, ppp } :
|
||||
let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rp-pppoe";
|
||||
version = "3.12";
|
||||
version = "4.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.roaringpenguin.com/files/download/rp-pppoe-${version}.tar.gz";
|
||||
sha256 = "1hl6rjvplapgsyrap8xj46kc9kqwdlm6ya6gp3lv0ihm0c24wy80";
|
||||
src = fetchFromGitHub {
|
||||
owner = "dfskoll";
|
||||
repo = "rp-pppoe";
|
||||
rev = version;
|
||||
hash = "sha256-2y26FVxVn8sU9/E2yJeJmbhAeOB0Go7EUPMU9H58H6U=";
|
||||
};
|
||||
|
||||
buildInputs = [ ppp ];
|
||||
@ -17,11 +19,13 @@ stdenv.mkDerivation rec {
|
||||
export PPPD=${ppp}/sbin/pppd
|
||||
'';
|
||||
|
||||
configureFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "rpppoe_cv_pack_bitfields=rev" ];
|
||||
configureFlags = [ "--enable-plugin=${ppp}/include" ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "rpppoe_cv_pack_bitfields=rev" ];
|
||||
|
||||
postConfigure = ''
|
||||
sed -i Makefile -e 's@DESTDIR)/etc/ppp@out)/etc/ppp@'
|
||||
sed -i Makefile -e 's@/etc/ppp/plugins@$(out)/lib@'
|
||||
sed -i Makefile -e 's@PPPOESERVER_PPPD_OPTIONS=@&$(out)@'
|
||||
sed -i Makefile -e '/# Directory created by rp-pppoe for kernel-mode plugin/d'
|
||||
'';
|
||||
|
||||
makeFlags = [ "AR:=$(AR)" ];
|
||||
@ -29,7 +33,8 @@ stdenv.mkDerivation rec {
|
||||
meta = with lib; {
|
||||
description = "Roaring Penguin Point-to-Point over Ethernet tool";
|
||||
platforms = platforms.linux;
|
||||
homepage = "https://www.roaringpenguin.com/products/pppoe";
|
||||
homepage = "https://github.com/dfskoll/rp-pppoe";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ DictXiong ];
|
||||
};
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user