summaryrefslogtreecommitdiffstats
path: root/makefu/1systems
diff options
context:
space:
mode:
authorlassulus <lass@blue.r>2018-09-12 14:23:33 +0200
committerlassulus <lass@blue.r>2018-09-12 14:23:33 +0200
commit296cec108130d5b626a24e9bf2e301f1ff8f8549 (patch)
tree7ed0b1ad9127091348e0a563e6da8c812a71f9e4 /makefu/1systems
parent6f85318656d90598388236e4b18a2f2f0cc14461 (diff)
parent859f98583788a9324be0e8c52d36a6bb812273fe (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/1systems')
-rw-r--r--makefu/1systems/iso/config.nix1
1 files changed, 1 insertions, 0 deletions
diff --git a/makefu/1systems/iso/config.nix b/makefu/1systems/iso/config.nix
index f863321bd..34a75dbd3 100644
--- a/makefu/1systems/iso/config.nix
+++ b/makefu/1systems/iso/config.nix
@@ -11,6 +11,7 @@ with import <stockholm/lib>;
# TODO: NIX_PATH and nix.nixPath are being set by default.nix right now
# cd ~/stockholm ; nix-build -A config.system.build.isoImage -I nixos-config=makefu/1systems/iso.nix -I secrets=/home/makefu/secrets/iso /var/src/nixpkgs/nixos
krebs.build.host = config.krebs.hosts.iso;
+ isoImage.isoBaseName = lib.mkForce "stockholm";
krebs.hidden-ssh.enable = true;
environment.systemPackages = with pkgs; [
aria2