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

rp-pppoe: 3.11 -> 3.12

This commit is contained in:
michael bishop 2015-11-23 11:56:03 +00:00
parent 26a9d2b27b
commit 0421745924
2 changed files with 17 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
pkgs/tools/networking/rp-pppoe/default.nix
View File

@ -1,42 +1,29 @@
a @ {ppp, ...} : { stdenv, fetchurl, ppp } :
let let
fetchurl = a.fetchurl; version = "3.12";
version = a.lib.attrByPath ["version"] "3.11" a;
buildInputs = with a; [
ppp
];
in in
rec { stdenv.mkDerivation rec {
name = "rp-pppoe-" + version;
src = fetchurl { src = fetchurl {
url = "http://www.roaringpenguin.com/files/download/rp-pppoe-${version}.tar.gz"; url = "http://www.roaringpenguin.com/files/download/rp-pppoe-${version}.tar.gz";
sha256 = "083pfjsb8w7afqgygbvgndwajgwkfmcnqla5vnk4z9yf5zcs98c6"; sha256 = "1hl6rjvplapgsyrap8xj46kc9kqwdlm6ya6gp3lv0ihm0c24wy80";
}; };
inherit buildInputs; buildInputs = [ ppp ];
configureFlags = [];
/* doConfigure should be removed if not needed */
phaseNames = ["exportVars" "doConfigure" "patchInstall" "makeDirs" "doMakeInstall"];
goSrcDir = "cd src"; preConfigure = ''
exportVars = a.noDepEntry('' cd src
export PATH="$PATH:${a.ppp}/sbin" export PPPD=${ppp}/sbin/pppd
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -L${a.ppp}/lib/${a.ppp.version}" '';
export PPPD=${a.ppp}/sbin/pppd postConfigure = ''
''); sed -i Makefile -e 's@DESTDIR)/etc/ppp@out)/etc/ppp@'
sed -i Makefile -e 's@PPPOESERVER_PPPD_OPTIONS=@&$(out)@'
'';
patchInstall = a.fullDepEntry(''
sed -i Makefile -e 's@DESTDIR)/etc/ppp@out)/share/${name}/etc/ppp@'
sed -i Makefile -e 's@PPPOESERVER_PPPD_OPTIONS=@&$(out)/share/${name}@'
'') ["minInit" "doUnpack"];
makeDirs = a.fullDepEntry(''
mkdir -p $out/share/${name}/etc/ppp
'') ["minInit" "defEnsureDir"];
name = "rp-pppoe-" + version;
meta = { meta = {
description = "Roaring Penguin Point-to-Point over Ethernet tool"; description = "Roaring Penguin Point-to-Point over Ethernet tool";
platforms = stdenv.lib.platforms.linux;
homepage = https://www.roaringpenguin.com/products/pppoe;
}; };
} }

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

@ -2902,7 +2902,7 @@ let
rosegarden = callPackage ../applications/audio/rosegarden { }; rosegarden = callPackage ../applications/audio/rosegarden { };
rpPPPoE = builderDefsPackage (callPackage ../tools/networking/rp-pppoe) { }; rpPPPoE = callPackage ../tools/networking/rp-pppoe { };
rpm = callPackage ../tools/package-management/rpm { }; rpm = callPackage ../tools/package-management/rpm { };