release.nix: Properly import vuizvui tests.

The tests from vuizvui itself weren't properly included in release.nix,
because we're patching up our own source tree and thus the evaluator is
unable to find the right path.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>

2 files changed, 9 insertions, 4 deletions

diff --git a/lib/get-tests.nix b/lib/get-tests.nix
index 0f93a5bb..08fc9475 100644
--- a/lib/get-tests.nix
+++ b/lib/get-tests.nix
@@ -1,4 +1,7 @@
-{ system ? builtins.currentSystem, nixpkgs ? import ../nixpkgs-path.nix }:
+{ system ? builtins.currentSystem
+, nixpkgs ? import ../nixpkgs-path.nix
+, vuizvuiTests ? ../tests
+}:
 
 with import "${nixpkgs}/lib";
 
@@ -13,7 +16,7 @@ with import "${nixpkgs}/lib";
     reduce = attr: if isTestOrJob attr then attr else attr.${system};
   in mapAttrsRecursiveCond cond (path: reduce) upstreamTests;
 
-  vuizvui = import ../tests {
+  vuizvui = import vuizvuiTests {
     inherit system;
   };
 }
diff --git a/release.nix b/release.nix
index fc72ee2b..dc51a345 100644
--- a/release.nix
+++ b/release.nix
@@ -63,9 +63,11 @@ in with pkgsUpstream.lib; with builtins; {
 
   tests = let
     machineList = collect (m: m ? build) allMachines;
-    allTests = import ./lib/get-tests.nix {
+    allTests = import ./lib/get-tests.nix ({
       inherit system nixpkgs;
-    };
+    } // optionalAttrs (vuizvuiSrc != null) {
+      vuizvuiTests = "${vuizvui}/tests";
+    });
     activatedTests = unique (concatMap (machine:
       machine.build.config.vuizvui.requiresTests
     ) machineList);