diff --git a/default.nix b/default.nix index db848cb..0f589fe 100644 --- a/default.nix +++ b/default.nix @@ -41,7 +41,14 @@ let borderVm = ((import ) { system = builtins.currentSystem; modules = [ - ({ ... } : { nixpkgs.overlays = [ overlay ]; }) + { + nixpkgs.overlays = [ + (final: prev: { + go-l2tp = final.callPackage ./pkgs/go-l2tp {}; + tufted = final.callPackage ./pkgs/tufted {}; + }) + ]; + } (import ./bordervm-configuration.nix) borderVmConf ]; diff --git a/pkgs/go-l2tp/default.nix b/pkgs/go-l2tp/default.nix index 297fc8c..636a611 100644 --- a/pkgs/go-l2tp/default.nix +++ b/pkgs/go-l2tp/default.nix @@ -1,7 +1,7 @@ { buildGoModule , fetchFromGitHub -, pppBuild +, ppp }: buildGoModule rec { @@ -16,7 +16,7 @@ buildGoModule rec { }; patchPhase = '' - sed -i.bak -e 's:/usr/sbin/pppd:${pppBuild}/bin/pppd:' cmd/kl2tpd/pppd.go + sed -i.bak -e 's:/usr/sbin/pppd:${ppp}/bin/pppd:' cmd/kl2tpd/pppd.go sed -i.bak -e 's:/usr/sbin/kl2tpd:${placeholder "out"}/bin/kl2tpd:' cmd/kpppoed/l2tpd_kl2tpd.go grep bin/kl2tp cmd/kpppoed/l2tpd_kl2tpd.go '';