From c0ef6ce282754818f7a73827dedad0f35ee2ad8a Mon Sep 17 00:00:00 2001
From: Daniel Barlow <dan@telent.net>
Date: Wed, 22 May 2024 18:44:12 +0100
Subject: [PATCH] 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
---
default.nix | 9 ++++++++-
pkgs/go-l2tp/default.nix | 4 ++--
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/default.nix b/default.nix
index cf17d2d2..0ce516e2 100644
--- a/default.nix
+++ b/default.nix
@@ -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
];
diff --git a/pkgs/go-l2tp/default.nix b/pkgs/go-l2tp/default.nix
index 297fc8c2..636a611a 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
'';