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

Merge pull request #76767 from dtzWill/update/spectral-2019-12-23

Browse Source 
spectral: unstable 2019-08-30 -> 817, olm: cmake+clean
This commit is contained in:
Will Dietz 2020-01-21 16:25:49 -06:00 committed by GitHub
commit 3bf9cc3154
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/applications/networking/instant-messengers/spectral/default.nix
View File

@ -7,34 +7,32 @@
, qtgraphicaleffects , qtgraphicaleffects
, qtdeclarative , qtdeclarative
, qtmacextras , qtmacextras
, olm, cmark , olm, libsecret, cmark
}: }:
let qtkeychain-qt5 = qtkeychain.override { let qtkeychain-qt5 = qtkeychain.override {
inherit qtbase qttools; inherit qtbase qttools;
withQt5 = true; withQt5 = true;
}; };
in stdenv.mkDerivation { in stdenv.mkDerivation rec {
pname = "spectral"; pname = "spectral";
version = "unstable-2019-08-30"; version = "817";
src = fetchgit { src = fetchgit {
url = "https://gitlab.com/b0/spectral.git"; url = "https://gitlab.com/spectral-im/spectral.git";
rev = "ee86c948aec5fe72979fc6df97f4a6ef711bdf94"; rev = version;
sha256 = "1mqabdkvzq48wki92wm2r79kj8g8m7ganpl47sh60qfsk4bxa8b2"; sha256 = "0lg0bkz621cmqb67kz1zmn4xwbspcqalz68byll5iszqz9y4gnp1";
fetchSubmodules = true; fetchSubmodules = true;
}; };
#qmakeFlags = [ "CONFIG+=qtquickcompiler" "BUNDLE_FONT=true" ];
nativeBuildInputs = [ pkgconfig cmake wrapQtAppsHook ]; nativeBuildInputs = [ pkgconfig cmake wrapQtAppsHook ];
buildInputs = [ qtbase qtkeychain-qt5 qtquickcontrols2 qtmultimedia qtgraphicaleffects qtdeclarative olm cmark ] buildInputs = [ qtbase qtkeychain-qt5 qtquickcontrols2 qtmultimedia qtgraphicaleffects qtdeclarative olm libsecret cmark ]
++ stdenv.lib.optional stdenv.hostPlatform.isLinux libpulseaudio ++ stdenv.lib.optional stdenv.hostPlatform.isLinux libpulseaudio
++ stdenv.lib.optional stdenv.hostPlatform.isDarwin qtmacextras; ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin qtmacextras;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A glossy cross-platform Matrix client."; description = "A glossy cross-platform Matrix client.";
homepage = "https://gitlab.com/b0/spectral"; homepage = "https://spectral.im";
license = licenses.gpl3; license = licenses.gpl3;
platforms = with platforms; linux ++ darwin; platforms = with platforms; linux ++ darwin;
maintainers = with maintainers; [ dtzWill ]; maintainers = with maintainers; [ dtzWill ];

14
pkgs/development/libraries/olm/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl }: { stdenv, fetchurl, cmake }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "olm"; pname = "olm";
@ -9,17 +9,9 @@ stdenv.mkDerivation rec {
sha256 = "0f7azjxc77n4ib9nj3cwyk3vhk8r2dsyf7id6nvqyxqxwxn95a8w"; sha256 = "0f7azjxc77n4ib9nj3cwyk3vhk8r2dsyf7id6nvqyxqxwxn95a8w";
}; };
nativeBuildInputs = [ cmake ];
doCheck = true; doCheck = true;
checkTarget = "test";
# requires optimisation but memory operations are compiled with -O0
hardeningDisable = ["fortify"];
makeFlags = stdenv.lib.optional stdenv.cc.isClang "CC=cc";
installFlags = [
"PREFIX=${placeholder ''out''}"
];
meta = { meta = {
description = "Implements double cryptographic ratchet and Megolm ratchet"; description = "Implements double cryptographic ratchet and Megolm ratchet";