1 files changed, 44 insertions, 57 deletions

diff --git a/default.nix b/default.nix
index a9095ef..6b30e6f 100644
--- a/default.nix
+++ b/default.nix
@@ -44,7 +44,7 @@ let
   pkgs = import nixpkgs {};
   stdenv = pkgs.overrideCC pkgs.stdenv pkgs.${compiler};
 
-in rec {
+  repo = rec {
     kasync = stdenv.mkDerivation {
         name = "kasync";
         nativeBuildInputs = with pkgs; [ cmake ninja ccache ];
@@ -90,12 +90,7 @@ in rec {
             kasync kimap2 kdav2
         ];
 
-        cmakeFlags = [
-            "-DCMAKE_CXX_FLAGS=-fdiagnostics-color=always"
-            "-DCMAKE_EXPORT_COMPILE_COMMANDS=1"
-        ];
-
-        postInstall = ''
+        postInstall = pkgs.lib.optionalString (cmakeBuildType == "Debug") ''
           mkdir -p $out/tests
           mkdir -p $out/bin
           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
@@ -107,45 +102,6 @@ in rec {
         inherit cmakeBuildType;
     };
 
-    sinkTest = pkgs.runCommand "sinkTest"
-      {
-        buildInputs = [ sink pkgs.qt5.qtbase pkgs.xvfb_run ];
-        realTests = pkgs.writeScript "sinkRealTests" ''
-          sinksh selftest &&
-            clientapitest &&
-            resourceconfigtest &&
-            storagetest &&
-            domainadaptortest &&
-            messagequeuetest &&
-            indextest &&
-            resourcecommunicationtest &&
-            pipelinetest &&
-            querytest &&
-            modelinteractivitytest &&
-            inspectiontest &&
-            accountstest &&
-            testaccounttest &&
-            dummyresourcemailtest &&
-            interresourcemovetest &&
-            notificationtest &&
-            entitystoretest &&
-            upgradetest &&
-            dummyresourcetest
-        '';
-      }
-      ''
-      export HOME="$(mktemp -d)"
-      export QT_PLUGIN_PATH=${sink}/lib/qt-5.10/plugins/:${pkgs.qt5.qtbase}/lib/qt-5.10/plugins/:$QT_PLUGIN_PATH
-      export LD_LIBRARY_PATH=${sink}/lib/qt-5.10/plugins/sink/resources:$LD_LIBRARY_PATH
-      export PATH=${sink}/tests:${sink}/bin:$PATH
-      cd "$HOME"
-      xvfb-run "$realTests"
-      ret=$?
-      rm -rf $HOME
-      touch $out
-      return $ret
-    '';
-
     kube = stdenv.mkDerivation {
         name = "kube";
         nativeBuildInputs = with pkgs; [ cmake ninja ccache ];
@@ -157,20 +113,51 @@ in rec {
             sink kasync
         ];
 
-        CCACHE_COMPRESS = 1;
-        CCACHE_DIR = "/var/cache/ccache";
-        CCACHE_UMASK = "007";
-
-        cmakeFlags = [
-            #"-DCMAKE_CXX_COMPILER_LAUNCHER=${pkgs.ccache}/bin/ccache"
-            "-DCMAKE_CXX_FLAGS=-fdiagnostics-color=always"
-            "-DCMAKE_EXPORT_COMPILE_COMMANDS=1"
-        ];
-
         dontStrip = if (cmakeBuildType == "Debug") then 1 else 0;
 
         src = kubeSrc;
 
         inherit cmakeBuildType;
     };
-}
+  };
+
+  sinkTest = pkgs.runCommand "sinkTest"
+    {
+      buildInputs = [ repo.sink pkgs.qt5.qtbase pkgs.xvfb_run ];
+      realTests = pkgs.writeScript "sinkRealTests" ''
+        sinksh selftest &&
+          clientapitest &&
+          resourceconfigtest &&
+          storagetest &&
+          domainadaptortest &&
+          messagequeuetest &&
+          indextest &&
+          resourcecommunicationtest &&
+          pipelinetest &&
+          querytest &&
+          modelinteractivitytest &&
+          inspectiontest &&
+          accountstest &&
+          testaccounttest &&
+          dummyresourcemailtest &&
+          interresourcemovetest &&
+          notificationtest &&
+          entitystoretest &&
+          upgradetest &&
+          dummyresourcetest
+      '';
+    }
+    ''
+    export HOME="$(mktemp -d)"
+    export QT_PLUGIN_PATH=${repo.sink}/lib/qt-5.10/plugins/:${pkgs.qt5.qtbase}/lib/qt-5.10/plugins/:$QT_PLUGIN_PATH
+    export LD_LIBRARY_PATH=${repo.sink}/lib/qt-5.10/plugins/sink/resources:$LD_LIBRARY_PATH
+    export PATH=${repo.sink}/tests:${repo.sink}/bin:$PATH
+    cd "$HOME"
+    xvfb-run "$realTests"
+    ret=$?
+    rm -rf $HOME
+    touch $out
+    return $ret
+  '';
+
+in repo // (if (cmakeBuildType == "Debug") then {inherit sinkTest;} else {})