list pkgs we need in bordervm build
it's a bit silly trying to build it with the whole liminix overlay when it's a nixos system not a liminix system
This commit is contained in:
parent
bd6ec5201f
commit
c0ef6ce282
@ -46,7 +46,14 @@ let
|
||||
borderVm = ((import <nixpkgs/nixos/lib/eval-config.nix>) {
|
||||
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
|
||||
];
|
||||
|
@ -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
|
||||
'';
|
||||
|
Loading…
Reference in New Issue
Block a user