From 388c73200132b56404bbbe4ec5c37a9a95c9e1de Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sun, 26 Nov 2017 23:32:18 +0800
Subject: quaternion: git -> 0.0.4

---
 .../instant-messengers/quaternion/default.nix      | 44 +++++++++++-----------
 1 file changed, 22 insertions(+), 22 deletions(-)

(limited to 'pkgs/applications/networking/instant-messengers/quaternion')

diff --git a/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/pkgs/applications/networking/instant-messengers/quaternion/default.nix
index 08625d3212350..c47075059d29b 100644
--- a/pkgs/applications/networking/instant-messengers/quaternion/default.nix
+++ b/pkgs/applications/networking/instant-messengers/quaternion/default.nix
@@ -1,29 +1,29 @@
-{ mkDerivation, lib, fetchgit, qtbase, qtquickcontrols, cmake }:
-
-mkDerivation rec {
-  name = "quaternion-git-${version}";
-  version = "2017-10-07";
-
-  # quaternion and tensor share the same libqmatrixclient library as a git submodule
-  #
-  # As all 3 projects are in very early stages, we simply load the submodule.
-  #
-  # At some point in the future, we should separate out libqmatrixclient into its own
-  # derivation.
-
-  src = fetchgit {
-    url             = "https://github.com/QMatrixClient/Quaternion.git";
-    rev             = "1007f2ca4ad5e8cc5dba437d6a0cdea07d1f1332";
-    sha256          = "0hvc81ld7fcwyrxsr2q3yvzh0rzhgmflby4nmyzcbjds7b7pv0xq";
-    fetchSubmodules = true;
+{ stdenv, lib, fetchFromGitHub, qtbase, qtquickcontrols, cmake, libqmatrixclient }:
+
+stdenv.mkDerivation rec {
+  name = "quaternion-${version}";
+  version = "0.0.4";
+
+  # libqmatrixclient doesn't support dynamic linking as of 0.1 so we simply pull in the source
+
+  src = fetchFromGitHub {
+    owner  = "QMatrixClient";
+    repo   = "Quaternion";
+    rev    = "v${version}";
+    sha256 = "0an2nvwjs1hf7cb4maaj3rskhgsjgimzazsx53ndxskzwcssidvi";
   };
 
-  buildInputs = [ qtbase qtquickcontrols ];
+  buildInputs = [ qtbase qtquickcontrols libqmatrixclient ];
+
   nativeBuildInputs = [ cmake ];
 
-  cmakeFlags = [
-    "-Wno-dev"
-  ];
+  enableParallelBuilding = true;
+
+  # take the source from libqmatrixclient
+  postPatch = ''
+    rm -rf lib
+    ln -s ${libqmatrixclient.src} lib
+  '';
 
   postInstall = ''
     substituteInPlace $out/share/applications/quaternion.desktop \
-- 
cgit 1.4.1