about summary refs log tree commit diff
path: root/release.nix
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2015-12-11 07:42:36 +0100
committeraszlig <aszlig@redmoonstudios.org>2015-12-11 07:42:36 +0100
commit9971dd1a6af1c1627dcb137dd8340514683d778d (patch)
tree9b660874aedb0e989063e1a89ea4bb8b79265f1e /release.nix
parentaa6741135cb7e78ab038eee798067f2df32bb6d9 (diff)
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>
Diffstat (limited to 'release.nix')
-rw-r--r--release.nix6
1 files changed, 4 insertions, 2 deletions
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);