add routeros to overlay
This commit is contained in:
parent
f356e475d6
commit
cc7daeabb3
7 changed files with 15 additions and 14 deletions
16
default.nix
16
default.nix
|
@ -97,13 +97,11 @@ in {
|
|||
# cross-compiling nix-shell for any package we're customizing
|
||||
inherit pkgs;
|
||||
|
||||
buildEnv =
|
||||
let routeros = pkgs.pkgsBuildBuild.callPackage ./tests/support/ppp-server {};
|
||||
in pkgs.mkShell {
|
||||
packages = [
|
||||
pkgs.pkgsBuildBuild.tufted
|
||||
routeros.routeros
|
||||
routeros.ros-exec-script
|
||||
];
|
||||
};
|
||||
buildEnv = pkgs.mkShell {
|
||||
packages = with pkgs.pkgsBuildBuild; [
|
||||
tufted
|
||||
routeros.routeros
|
||||
routeros.ros-exec-script
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -25,9 +25,6 @@ final: prev: {
|
|||
nettle = null;
|
||||
};
|
||||
|
||||
|
||||
tufted = final.callPackage ./pkgs/tufted {};
|
||||
|
||||
pppoe = final.callPackage ./pkgs/pppoe {};
|
||||
ppp =
|
||||
(prev.ppp.override {
|
||||
|
@ -83,4 +80,10 @@ final: prev: {
|
|||
sha256 = "0b03bdvm388kwlcz97aflpr3ir1zpa3m0bq3s6cd3pp5a667lcwz";
|
||||
};
|
||||
};
|
||||
|
||||
# these are packages for the build system not the host/target
|
||||
|
||||
tufted = final.callPackage ./pkgs/tufted {};
|
||||
routeros = final.callPackage ./pkgs/routeros {};
|
||||
|
||||
}
|
||||
|
|
|
@ -6,8 +6,8 @@ let img = (import liminix {
|
|||
device = import "${liminix}/devices/qemu/";
|
||||
liminix-config = ./configuration.nix;
|
||||
}).outputs.default;
|
||||
pkgs = import <nixpkgs> {};
|
||||
ros = pkgs.callPackage ../support/ppp-server {};
|
||||
pkgs = import <nixpkgs> { overlays = [(import ../../overlay.nix)]; };
|
||||
ros = pkgs.pkgsBuildBuild.routeros;
|
||||
run-qemu = pkgs.writeShellScriptBin "run-qemu" ''
|
||||
export PATH="${pkgs.lib.makeBinPath [pkgs.qemu]}:$PATH"
|
||||
${builtins.readFile ../../scripts/run-qemu.sh}
|
||||
|
|
Loading…
Reference in a new issue