diff options
author | michael bishop <cleverca22@gmail.com> | 2015-11-23 11:56:03 +0000 |
---|---|---|
committer | michael bishop <cleverca22@gmail.com> | 2015-11-23 11:56:03 +0000 |
commit | 04217459246994ee5982e5e23f47e831e1184540 (patch) | |
tree | 2c358af9d045f58ad5297012dd4df52d5f9d54d4 /pkgs/tools/networking/rp-pppoe | |
parent | 26a9d2b27b3ede423e60539c86535723c8e8cc13 (diff) | |
download | nixpkgs-04217459246994ee5982e5e23f47e831e1184540.tar nixpkgs-04217459246994ee5982e5e23f47e831e1184540.tar.gz nixpkgs-04217459246994ee5982e5e23f47e831e1184540.tar.bz2 nixpkgs-04217459246994ee5982e5e23f47e831e1184540.tar.lz nixpkgs-04217459246994ee5982e5e23f47e831e1184540.tar.xz nixpkgs-04217459246994ee5982e5e23f47e831e1184540.tar.zst nixpkgs-04217459246994ee5982e5e23f47e831e1184540.zip |
rp-pppoe: 3.11 -> 3.12
Diffstat (limited to 'pkgs/tools/networking/rp-pppoe')
-rw-r--r-- | pkgs/tools/networking/rp-pppoe/default.nix | 45 |
1 files changed, 16 insertions, 29 deletions
diff --git a/pkgs/tools/networking/rp-pppoe/default.nix b/pkgs/tools/networking/rp-pppoe/default.nix index fcbb5f63d82..4651dab7e67 100644 --- a/pkgs/tools/networking/rp-pppoe/default.nix +++ b/pkgs/tools/networking/rp-pppoe/default.nix @@ -1,42 +1,29 @@ -a @ {ppp, ...} : +{ stdenv, fetchurl, ppp } : let - fetchurl = a.fetchurl; - - version = a.lib.attrByPath ["version"] "3.11" a; - buildInputs = with a; [ - ppp - ]; + version = "3.12"; in -rec { +stdenv.mkDerivation rec { + name = "rp-pppoe-" + version; src = fetchurl { url = "http://www.roaringpenguin.com/files/download/rp-pppoe-${version}.tar.gz"; - sha256 = "083pfjsb8w7afqgygbvgndwajgwkfmcnqla5vnk4z9yf5zcs98c6"; + sha256 = "1hl6rjvplapgsyrap8xj46kc9kqwdlm6ya6gp3lv0ihm0c24wy80"; }; - inherit buildInputs; - configureFlags = []; - - /* doConfigure should be removed if not needed */ - phaseNames = ["exportVars" "doConfigure" "patchInstall" "makeDirs" "doMakeInstall"]; + buildInputs = [ ppp ]; - goSrcDir = "cd src"; - exportVars = a.noDepEntry('' - export PATH="$PATH:${a.ppp}/sbin" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -L${a.ppp}/lib/${a.ppp.version}" - export PPPD=${a.ppp}/sbin/pppd - ''); - 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"]; + preConfigure = '' + cd src + export PPPD=${ppp}/sbin/pppd + ''; + postConfigure = '' + sed -i Makefile -e 's@DESTDIR)/etc/ppp@out)/etc/ppp@' + sed -i Makefile -e 's@PPPOESERVER_PPPD_OPTIONS=@&$(out)@' + ''; - makeDirs = a.fullDepEntry('' - mkdir -p $out/share/${name}/etc/ppp - '') ["minInit" "defEnsureDir"]; - - name = "rp-pppoe-" + version; meta = { description = "Roaring Penguin Point-to-Point over Ethernet tool"; + platforms = stdenv.lib.platforms.linux; + homepage = https://www.roaringpenguin.com/products/pppoe; }; } |