Remove bootstrap argument from default.nix
This commit is contained in:
parent
f639d460cf
commit
9e9e98584f
19
default.nix
19
default.nix
@ -5,9 +5,6 @@
|
||||
|
||||
revision ? "dev",
|
||||
releaseName ? "dev",
|
||||
|
||||
bootstrap ? null, # TODO remove this
|
||||
|
||||
}: let
|
||||
|
||||
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 {
|
||||
name = "isle-AppDir-base";
|
||||
paths = [
|
||||
|
||||
./AppDir
|
||||
version
|
||||
dnsmasq
|
||||
nebula
|
||||
garage
|
||||
pkgs.minio-client
|
||||
|
||||
] ++ (if bootstrap != null then [ rootedBootstrap ] else []);
|
||||
];
|
||||
};
|
||||
|
||||
appDir = pkgs.stdenv.mkDerivation {
|
||||
|
Loading…
Reference in New Issue
Block a user