diff options
author | vojta001 <vojtech.kane@gmail.com> | 2020-12-20 20:21:32 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-20 19:21:32 +0000 |
commit | fbefb7e7a19f2b4a91c8cd7ebe2898985cea0039 (patch) | |
tree | 0b5a7a83faa2d06a42aa08a39c913f5f5ca689e6 /pkgs/applications/networking/instant-messengers/mirage | |
parent | 4a8ed1661dcc22f90f24c80c9ab1f88a43d71563 (diff) |
mirage: 0.5.2 -> 0.6.4 (#99121)
* mirage: 0.5.2 -> 0.6.4 * mirage: Use qtquickcompiler to prevent QML cache problems * mirage: Mark it as broken on Darwin * mirage: refactor
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/mirage')
-rw-r--r-- | pkgs/applications/networking/instant-messengers/mirage/default.nix | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/applications/networking/instant-messengers/mirage/default.nix b/pkgs/applications/networking/instant-messengers/mirage/default.nix index 0aa2dbf889bb5..decdb18aa0637 100644 --- a/pkgs/applications/networking/instant-messengers/mirage/default.nix +++ b/pkgs/applications/networking/instant-messengers/mirage/default.nix @@ -1,7 +1,7 @@ -{ lib, mkDerivation, fetchFromGitHub +{ stdenv, mkDerivation, fetchFromGitHub , qmake, pkgconfig, olm, wrapQtAppsHook , qtbase, qtquickcontrols2, qtkeychain, qtmultimedia, qttools, qtgraphicaleffects -, python3Packages, pyotherside +, python3Packages, pyotherside, libXScrnSaver }: let @@ -13,13 +13,13 @@ let in mkDerivation rec { pname = "mirage"; - version = "0.5.2"; + version = "0.6.4"; src = fetchFromGitHub { owner = "mirukana"; repo = pname; rev = "v${version}"; - sha256 = "0i891fafdncdz1xg6nji80jb86agsrbdvai9nwf1yy126q7piryv"; + sha256 = "15x0x2rf4fzsd0zr84fq3j3ddzkgc5il8s54jpxk8wl4ah03g4nv"; fetchSubmodules = true; }; @@ -30,13 +30,14 @@ mkDerivation rec { qtquickcontrols2 qtkeychain qtgraphicaleffects olm pyotherside + libXScrnSaver ]; propagatedBuildInputs = pypkgs; pythonPath = pypkgs; - qmakeFlags = [ "PREFIX=${placeholder "out"}" ]; + qmakeFlags = [ "PREFIX=${placeholder "out"}" "CONFIG+=qtquickcompiler" ]; dontWrapQtApps = true; postInstall = '' @@ -46,11 +47,12 @@ mkDerivation rec { "''${qtWrapperArgs[@]}" ''; - meta = with lib; { + meta = with stdenv.lib; { description = "A fancy, customizable, keyboard-operable Qt/QML+Python Matrix chat client for encrypted and decentralized communication"; homepage = "https://github.com/mirukana/mirage"; license = licenses.lgpl3; maintainers = with maintainers; [ colemickens ]; + broken = stdenv.isDarwin; inherit (qtbase.meta) platforms; inherit version; }; |