raboof/liminix
1
0
Fork 0
forked from dan/liminix
Code Pull Requests Activity

list pkgs we need in bordervm build

Browse Source 
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:
Daniel Barlow 2024-05-22 18:44:12 +01:00
parent bd6ec5201f
commit c0ef6ce282
2 changed files with 10 additions and 3 deletions

9
default.nix
View File

@ -46,7 +46,14 @@ let
borderVm = ((import <nixpkgs/nixos/lib/eval-config.nix>) { borderVm = ((import <nixpkgs/nixos/lib/eval-config.nix>) {
system = builtins.currentSystem; system = builtins.currentSystem;
modules = [ modules = [
({ ... } : { nixpkgs.overlays = [ overlay ]; }) {
nixpkgs.overlays = [
(final: prev: {
go-l2tp = final.callPackage ./pkgs/go-l2tp {};
tufted = final.callPackage ./pkgs/tufted {};
})
];
}
(import ./bordervm-configuration.nix) (import ./bordervm-configuration.nix)
borderVmConf borderVmConf
]; ];

4
pkgs/go-l2tp/default.nix
View File

@ -1,7 +1,7 @@
{ {
buildGoModule buildGoModule
, fetchFromGitHub , fetchFromGitHub
, pppBuild , ppp
}: }:
buildGoModule rec { buildGoModule rec {
@ -16,7 +16,7 @@ buildGoModule rec {
}; };
patchPhase = '' 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 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 grep bin/kl2tp cmd/kpppoed/l2tpd_kl2tpd.go
''; '';