nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-30 01:23:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

rpPPPoE: 3.12 -> 4.0 (#349480)

Browse Source
This commit is contained in:
misuzu 2024-12-05 16:02:51 +02:00 committed by GitHub
commit d641ace370
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
maintainers/maintainer-list.nix
View File

@ -5584,6 +5584,12 @@
githubId = 15774340; githubId = 15774340;
name = "Thomas Depierre"; name = "Thomas Depierre";
}; };
DictXiong = {
email = "me@beardic.cn";
github = "DictXiong";
githubId = 41772157;
name = "Dict Xiong";
};
diegolelis = { diegolelis = {
email = "diego.o.lelis@gmail.com"; email = "diego.o.lelis@gmail.com";
github = "DiegoLelis"; github = "DiegoLelis";

19
pkgs/by-name/rp/rpPPPoE/package.nix
View File

@ -1,13 +1,15 @@
{ lib, stdenv, fetchurl, ppp } : { lib, stdenv, fetchFromGitHub, ppp } :
let let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "rp-pppoe"; pname = "rp-pppoe";
version = "3.12"; version = "4.0";
src = fetchurl { src = fetchFromGitHub {
url = "https://www.roaringpenguin.com/files/download/rp-pppoe-${version}.tar.gz"; owner = "dfskoll";
sha256 = "1hl6rjvplapgsyrap8xj46kc9kqwdlm6ya6gp3lv0ihm0c24wy80"; repo = "rp-pppoe";
rev = version;
hash = "sha256-2y26FVxVn8sU9/E2yJeJmbhAeOB0Go7EUPMU9H58H6U=";
}; };
buildInputs = [ ppp ]; buildInputs = [ ppp ];
@ -17,11 +19,13 @@ stdenv.mkDerivation rec {
export PPPD=${ppp}/sbin/pppd 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 = '' postConfigure = ''
sed -i Makefile -e 's@DESTDIR)/etc/ppp@out)/etc/ppp@' 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 's@PPPOESERVER_PPPD_OPTIONS=@&$(out)@'
sed -i Makefile -e '/# Directory created by rp-pppoe for kernel-mode plugin/d'
''; '';
makeFlags = [ "AR:=$(AR)" ]; makeFlags = [ "AR:=$(AR)" ];
@ -29,7 +33,8 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "Roaring Penguin Point-to-Point over Ethernet tool"; description = "Roaring Penguin Point-to-Point over Ethernet tool";
platforms = platforms.linux; platforms = platforms.linux;
homepage = "https://www.roaringpenguin.com/products/pppoe"; homepage = "https://github.com/dfskoll/rp-pppoe";
license = licenses.gpl2Plus; license = licenses.gpl2Plus;
maintainers = with maintainers; [ DictXiong ];
}; };
} }