summaryrefslogtreecommitdiffstats
path: root/makefu/1systems/iso
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2017-07-15 19:01:02 +0200
committermakefu <github@syntax-fehler.de>2017-07-15 22:29:14 +0200
commit7704f80890c75f65c2906ecc17cdd89761d308ad (patch)
treefebe3c92e7eb672767f7162f175b2d94fe51c2e7 /makefu/1systems/iso
parentfa38155eec9563dc9dc620a77900d87b97443cfe (diff)
ma: replace path to 2configs, init source.nix
Diffstat (limited to 'makefu/1systems/iso')
-rw-r--r--makefu/1systems/iso/config.nix4
-rw-r--r--makefu/1systems/iso/source.nix3
2 files changed, 5 insertions, 2 deletions
diff --git a/makefu/1systems/iso/config.nix b/makefu/1systems/iso/config.nix
index c679241e..f863321b 100644
--- a/makefu/1systems/iso/config.nix
+++ b/makefu/1systems/iso/config.nix
@@ -3,10 +3,10 @@
with import <stockholm/lib>;
{
imports = [
- ../.
+ <stockholm/makefu>
<nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix>
<nixpkgs/nixos/modules/installer/cd-dvd/channel.nix>
- ../2configs/tools/core.nix
+ <stockholm/makefu/2configs/tools/core.nix>
];
# 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
diff --git a/makefu/1systems/iso/source.nix b/makefu/1systems/iso/source.nix
new file mode 100644
index 00000000..e200dbfd
--- /dev/null
+++ b/makefu/1systems/iso/source.nix
@@ -0,0 +1,3 @@
+import <stockholm/makefu/source.nix> {
+ name="iso";
+}