quaternion: 0.0.9.2 -> 0.0.9.3

1 files changed, 5 insertions, 19 deletions

diff --git a/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/pkgs/applications/networking/instant-messengers/quaternion/default.nix
index 983646fbad539..55b24f71fb64a 100644
--- a/pkgs/applications/networking/instant-messengers/quaternion/default.nix
+++ b/pkgs/applications/networking/instant-messengers/quaternion/default.nix
@@ -1,35 +1,21 @@
-{ stdenv, lib, fetchFromGitHub, fetchpatch, qtbase, qtquickcontrols, cmake, libqmatrixclient }:
+{ stdenv, lib, fetchFromGitHub, qtbase, qtquickcontrols, cmake
+, qttools, libqmatrixclient }:
 
 stdenv.mkDerivation rec {
   name = "quaternion-${version}";
-  version = "0.0.9.2";
+  version = "0.0.9.3";
 
   src = fetchFromGitHub {
     owner  = "QMatrixClient";
     repo   = "Quaternion";
     rev    = "v${version}";
-    sha256 = "0zrr4khbbdf5ziq65gi0cb1yb1d0y5rv18wld22w1x96f7fkmrib";
+    sha256 = "1hr9zqf301rg583n9jv256vzj7y57d8qgayk7c723bfknf1s6hh3";
   };
 
-  buildInputs = [ qtbase qtquickcontrols ];
+  buildInputs = [ qtbase qtquickcontrols qttools libqmatrixclient ];
 
   nativeBuildInputs = [ cmake ];
 
-  patches = [
-    # https://github.com/QMatrixClient/Quaternion/pull/400
-    (fetchpatch {
-      url = "https://github.com/QMatrixClient/Quaternion/commit/6cb29834efc343dc2bcf1db62cfad2dc4c121c54.patch";
-      sha256 = "0n7mgzzrvx9sa657rfb99i0mjh1k0sn5br344mknqy3wgqdr7s3x";
-    })
-  ];
-
-  # libqmatrixclient is now compiled as a dynamic library but quarternion cannot use it yet
-  # https://github.com/QMatrixClient/Quaternion/issues/239
-  postPatch = ''
-    rm -rf lib
-    ln -s ${libqmatrixclient.src} lib
-  '';
-
   postInstall = if stdenv.isDarwin then ''
     mkdir -p $out/Applications
     mv $out/bin/quaternion.app $out/Applications