From 4584c1bac393e8e4dc1a6568c7f2fe4e7674ba89 Mon Sep 17 00:00:00 2001
From: Minijackson <minijackson@riseup.net>
Date: Fri, 10 Aug 2018 11:30:55 +0200
Subject: Better way to run command

---
 default.nix | 61 +++++++++++++++++++++++++++++--------------------------------
 1 file changed, 29 insertions(+), 32 deletions(-)

diff --git a/default.nix b/default.nix
index 72b148b..d46f9d8 100644
--- a/default.nix
+++ b/default.nix
@@ -99,38 +99,35 @@ in rec {
         inherit cmakeBuildType;
     };
 
-    sinkTest = stdenv.mkDerivation {
-      name = "sinkTest";
-      buildInputs = [ sink ];
-      buildPhase = ''
-        export HOME="$(mktemp -d)"
-        cd "${sink}"
-        ./tests/clientapitest &&
-          ./tests/resourceconfigtest &&
-          ./tests/storagetest &&
-          ./tests/domainadaptortest &&
-          ./tests/messagequeuetest &&
-          ./tests/indextest &&
-          ./tests/resourcecommunicationtest &&
-          ./tests/pipelinetest &&
-          ./tests/querytest &&
-          ./tests/modelinteractivitytest &&
-          ./tests/inspectiontest &&
-          ./tests/accountstest &&
-          ./tests/testaccounttest &&
-          ./tests/dummyresourcemailtest &&
-          ./tests/interresourcemovetest &&
-          ./tests/notificationtest &&
-          ./tests/entitystoretest &&
-          ./tests/upgradetest &&
-          ./tests/resourcecontroltest &&
-          ./tests/dummyresourcetest
-        ret=$?
-        rm -rf $HOME
-        touch $out
-        return $ret
-      '';
-    };
+    sinkTest = pkgs.runCommand "sinkTest"
+      { buildInputs = [ sink ]; }
+      ''
+      export HOME="$(mktemp -d)"
+      cd "${sink}"
+      ./tests/clientapitest &&
+        ./tests/resourceconfigtest &&
+        ./tests/storagetest &&
+        ./tests/domainadaptortest &&
+        ./tests/messagequeuetest &&
+        ./tests/indextest &&
+        ./tests/resourcecommunicationtest &&
+        ./tests/pipelinetest &&
+        ./tests/querytest &&
+        ./tests/modelinteractivitytest &&
+        ./tests/inspectiontest &&
+        ./tests/accountstest &&
+        ./tests/testaccounttest &&
+        ./tests/dummyresourcemailtest &&
+        ./tests/interresourcemovetest &&
+        ./tests/notificationtest &&
+        ./tests/entitystoretest &&
+        ./tests/upgradetest &&
+        ./tests/resourcecontroltest &&
+        ./tests/dummyresourcetest
+      ret=$?
+      rm -rf $HOME
+      return $ret
+    '';
 
     kube = stdenv.mkDerivation {
         name = "kube";
-- 
cgit v1.2.3