diff options
author | pacien | 2022-11-13 01:41:20 +0100 |
---|---|---|
committer | pacien | 2022-11-13 01:41:46 +0100 |
commit | fae2859c4ebcb5c25025cdbd1dffb294a2b9e38e (patch) | |
tree | c3163dd8998bf7e796a19a1fa16cfc90f592b348 | |
parent | ebd825349bfc1f011f2d8e322df1703de085293f (diff) | |
download | flaky-utils-fae2859c4ebcb5c25025cdbd1dffb294a2b9e38e.tar.gz |
mkSandboxSystem: use supplied pkgs instance
-rw-r--r-- | example/flake.nix | 2 | ||||
-rw-r--r-- | lib/mk-sandbox-system.nix | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/example/flake.nix b/example/flake.nix index 8557265..50931c6 100644 --- a/example/flake.nix +++ b/example/flake.nix | |||
@@ -59,7 +59,7 @@ | |||
59 | # forwarded explicitly from host to guest and vice-versa. | 59 | # forwarded explicitly from host to guest and vice-versa. |
60 | # | 60 | # |
61 | (flaky-utils.lib.mkSandboxSystem { | 61 | (flaky-utils.lib.mkSandboxSystem { |
62 | inherit nixpkgs system; | 62 | inherit pkgs; |
63 | 63 | ||
64 | name = "sandbox"; | 64 | name = "sandbox"; |
65 | user = "dummy"; | 65 | user = "dummy"; |
diff --git a/lib/mk-sandbox-system.nix b/lib/mk-sandbox-system.nix index 5574736..232fc4c 100644 --- a/lib/mk-sandbox-system.nix +++ b/lib/mk-sandbox-system.nix | |||
@@ -1,5 +1,4 @@ | |||
1 | { nixpkgs | 1 | { pkgs |
2 | , system | ||
3 | , name ? "sandbox" | 2 | , name ? "sandbox" |
4 | , user ? "dummy" | 3 | , user ? "dummy" |
5 | , config ? { } | 4 | , config ? { } |
@@ -8,8 +7,6 @@ | |||
8 | }: | 7 | }: |
9 | 8 | ||
10 | let | 9 | let |
11 | pkgs = import nixpkgs { inherit system; }; | ||
12 | |||
13 | # Patched QEMU to fix slow 9p file share. | 10 | # Patched QEMU to fix slow 9p file share. |
14 | # https://linus.schreibt.jetzt/posts/qemu-9p-performance.html | 11 | # https://linus.schreibt.jetzt/posts/qemu-9p-performance.html |
15 | qemu_kvm_patched_9p = | 12 | qemu_kvm_patched_9p = |