Make it possible to get installed on Darwin
This commit is contained in:
@@ -56,6 +56,11 @@
|
||||
_module.args.pkgs = import inputs.nixpkgs {
|
||||
inherit system;
|
||||
config.allowUnfree = true;
|
||||
overlays = [
|
||||
(_f: p: {
|
||||
OVMF = p.OVMF.overrideAttrs { meta.broken = false; };
|
||||
})
|
||||
];
|
||||
};
|
||||
|
||||
devShells.default = pkgs.mkShell {
|
||||
@@ -63,10 +68,13 @@
|
||||
shellHook = self'.checks.pre-commit.shellHook;
|
||||
|
||||
packages =
|
||||
(with pkgs; [
|
||||
packer
|
||||
vagrant
|
||||
])
|
||||
(
|
||||
with pkgs;
|
||||
[
|
||||
packer
|
||||
]
|
||||
++ lib.optional (!pkgs.stdenv.isDarwin) vagrant
|
||||
)
|
||||
++ (with self'.packages; [
|
||||
cache
|
||||
generate
|
||||
@@ -77,7 +85,7 @@
|
||||
# These commands will be shown in the motd that users read
|
||||
# upon entering the shell
|
||||
env = {
|
||||
EFI_DIR = "${pkgs.OVMF.fd}/FV/";
|
||||
EFI_DIR = if pkgs.stdenv.isDarwin then "" else "${pkgs.OVMF.fd}/FV/";
|
||||
PACKER_CONFIG_DIR = "./packer_config";
|
||||
STORAGE_URL = "s3.thehellings.lan:9000";
|
||||
};
|
||||
@@ -90,14 +98,16 @@
|
||||
prefix: d: args:
|
||||
pkgs.writeShellApplication {
|
||||
name = "${prefix}${name d}";
|
||||
runtimeInputs = with pkgs; [
|
||||
cdrtools
|
||||
findutils
|
||||
packer
|
||||
qemu_full
|
||||
vagrant
|
||||
xorriso
|
||||
];
|
||||
runtimeInputs =
|
||||
with pkgs;
|
||||
[
|
||||
cdrtools
|
||||
findutils
|
||||
packer
|
||||
qemu_full
|
||||
xorriso
|
||||
]
|
||||
++ lib.optional (!pkgs.stdenv.isDarwin) vagrant;
|
||||
text = ''
|
||||
# This is a workaround for a goofy behavior in CI
|
||||
if [ -e "''${PACKER_CONFIG_DIR}" ]; then
|
||||
|
||||
Reference in New Issue
Block a user