micropelago/isle
4
1
Fork 0
Code Issues 1 Pull Requests Projects Releases 5 Activity

Remove bootstrap argument from default.nix

Browse Source
This commit is contained in:
Brian Picciano 2024-10-15 21:45:27 +02:00
parent f639d460cf
commit 9e9e98584f
1 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
default.nix
View File

@ -5,9 +5,6 @@
revision ? "dev", revision ? "dev",
releaseName ? "dev", releaseName ? "dev",
bootstrap ? null, # TODO remove this
}: let }: let
pkgs = pkgsNix.default { pkgs = pkgsNix.default {
@ -93,30 +90,16 @@ in rec {
}; };
rootedBootstrap = pkgs.stdenv.mkDerivation {
name = "isle-rooted-bootstrap";
src = bootstrap;
builder = builtins.toFile "builder.sh" ''
source $stdenv/setup
mkdir -p "$out"/share
cp "$src" "$out"/share/bootstrap.json
'';
};
appDirBase = pkgs.buildEnv { appDirBase = pkgs.buildEnv {
name = "isle-AppDir-base"; name = "isle-AppDir-base";
paths = [ paths = [
./AppDir ./AppDir
version version
dnsmasq dnsmasq
nebula nebula
garage garage
pkgs.minio-client pkgs.minio-client
];
] ++ (if bootstrap != null then [ rootedBootstrap ] else []);
}; };
appDir = pkgs.stdenv.mkDerivation { appDir = pkgs.stdenv.mkDerivation {