public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mirage: 0.5.2 -> 0.6.4 (#99121)

Browse Source 
* mirage: 0.5.2 -> 0.6.4

* mirage: Use qtquickcompiler to prevent QML cache problems

* mirage: Mark it as broken on Darwin

* mirage: refactor
This commit is contained in:
vojta001 2020-12-20 20:21:32 +01:00 committed by GitHub
parent 4a8ed1661d
commit fbefb7e7a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/applications/networking/instant-messengers/mirage/default.nix
View File

@ -1,7 +1,7 @@
{ lib, mkDerivation, fetchFromGitHub { stdenv, mkDerivation, fetchFromGitHub
, qmake, pkgconfig, olm, wrapQtAppsHook , qmake, pkgconfig, olm, wrapQtAppsHook
, qtbase, qtquickcontrols2, qtkeychain, qtmultimedia, qttools, qtgraphicaleffects , qtbase, qtquickcontrols2, qtkeychain, qtmultimedia, qttools, qtgraphicaleffects
, python3Packages, pyotherside , python3Packages, pyotherside, libXScrnSaver
}: }:
let let
@ -13,13 +13,13 @@ let
in in
mkDerivation rec { mkDerivation rec {
pname = "mirage"; pname = "mirage";
version = "0.5.2"; version = "0.6.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mirukana"; owner = "mirukana";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "0i891fafdncdz1xg6nji80jb86agsrbdvai9nwf1yy126q7piryv"; sha256 = "15x0x2rf4fzsd0zr84fq3j3ddzkgc5il8s54jpxk8wl4ah03g4nv";
fetchSubmodules = true; fetchSubmodules = true;
}; };
@ -30,13 +30,14 @@ mkDerivation rec {
qtquickcontrols2 qtquickcontrols2
qtkeychain qtgraphicaleffects qtkeychain qtgraphicaleffects
olm pyotherside olm pyotherside
libXScrnSaver
]; ];
propagatedBuildInputs = pypkgs; propagatedBuildInputs = pypkgs;
pythonPath = pypkgs; pythonPath = pypkgs;
qmakeFlags = [ "PREFIX=${placeholder "out"}" ]; qmakeFlags = [ "PREFIX=${placeholder "out"}" "CONFIG+=qtquickcompiler" ];
dontWrapQtApps = true; dontWrapQtApps = true;
postInstall = '' postInstall = ''
@ -46,11 +47,12 @@ mkDerivation rec {
"''${qtWrapperArgs[@]}" "''${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"; description = "A fancy, customizable, keyboard-operable Qt/QML+Python Matrix chat client for encrypted and decentralized communication";
homepage = "https://github.com/mirukana/mirage"; homepage = "https://github.com/mirukana/mirage";
license = licenses.lgpl3; license = licenses.lgpl3;
maintainers = with maintainers; [ colemickens ]; maintainers = with maintainers; [ colemickens ];
broken = stdenv.isDarwin;
inherit (qtbase.meta) platforms; inherit (qtbase.meta) platforms;
inherit version; inherit version;
}; };