From 6c8d03b4fd5873cbd48ed5d34155b489ef07de22 Mon Sep 17 00:00:00 2001
From: Minijackson <minijackson@riseup.net>
Date: Fri, 10 Aug 2018 13:05:31 +0200
Subject: Fix some things

---
 default.nix | 63 +++++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 38 insertions(+), 25 deletions(-)

diff --git a/default.nix b/default.nix
index d46f9d8..eb758cf 100644
--- a/default.nix
+++ b/default.nix
@@ -24,12 +24,17 @@
 
   sinkSrc ? nixpkgs.fetchgit {
     url = "https://github.com/KDE/sink";
-    rev = "e1a6d6f5bbaeeffd92a2049849b75e248c2d492b";
-    sha256 = "196vqd7gk93mfizxnfz918rs5g3723ndarx79x84q8qvk7bngc0v";
+    rev = "b91aedf79c3bb5b803ec9a335baab385a19cbbbc";
+    sha256 = "0wjndk9cl70yb6vppiq9r9vw4w60l4fbf537l3fy47f3k9j001kx";
     fetchSubmodules = true;
   },
 
-  kubeSrc,
+  kubeSrc ? nixpkgs.fetchgit {
+    url = "https://github.com/KDE/kube";
+    rev = "919b7cd8a40a42cf03e823efd6d4db1294c2a6ef";
+    sha256 = "18bfnp0a460kxy8m2wip2s7gjdyas0cbv118hl4jvv65ylhz0mn5";
+    fetchSubmodules = true;
+  },
 
   compiler ? "gcc7",
   cmakeBuildType ? "Debug"
@@ -93,6 +98,7 @@ in rec {
         postInstall = ''
           mkdir -p $out/tests
           cp ./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 $out/tests
+          cp ./tests/libsink_test.so $out/lib
         '';
 
         src = sinkSrc;
@@ -100,30 +106,37 @@ in rec {
     };
 
     sinkTest = pkgs.runCommand "sinkTest"
-      { buildInputs = [ sink ]; }
+      {
+        buildInputs = [ sink pkgs.qt5.qtbase pkgs.xvfb_run ];
+        realTests = pkgs.writeScript "sinkRealTests" ''
+          clientapitest &&
+            resourceconfigtest &&
+            storagetest &&
+            domainadaptortest &&
+            messagequeuetest &&
+            indextest &&
+            resourcecommunicationtest &&
+            pipelinetest &&
+            querytest &&
+            modelinteractivitytest &&
+            inspectiontest &&
+            accountstest &&
+            testaccounttest &&
+            dummyresourcemailtest &&
+            interresourcemovetest &&
+            notificationtest &&
+            entitystoretest &&
+            upgradetest &&
+            resourcecontroltest &&
+            dummyresourcetest
+        '';
+      }
       ''
       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
+      export QT_PLUGIN_PATH=${sink}/lib/qt-5.10/plugins/:${pkgs.qt5.qtbase}/lib/qt-5.10/plugins/:$QT_PLUGIN_PATH
+      export PATH=${sink}/tests:$PATH
+      cd "$HOME"
+      xvfb-run "$realTests"
       ret=$?
       rm -rf $HOME
       return $ret
-- 
cgit v1.2.3