Merge pull request #243257 from r-ryantm/auto-update/libquotient
libquotient: 0.7.2 -> 0.8.0
This commit is contained in:
commit
aeee6bcaa5
|
@ -1,5 +1,6 @@
|
||||||
{ mkDerivation
|
{ mkDerivation
|
||||||
, lib
|
, lib
|
||||||
|
, fetchpatch
|
||||||
|
|
||||||
, cmake
|
, cmake
|
||||||
, extra-cmake-modules
|
, extra-cmake-modules
|
||||||
|
@ -32,6 +33,14 @@
|
||||||
mkDerivation {
|
mkDerivation {
|
||||||
pname = "neochat";
|
pname = "neochat";
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
(fetchpatch {
|
||||||
|
name = "libquotient-0.8.patch";
|
||||||
|
url = "https://invent.kde.org/network/neochat/-/commit/d9d5e17be2a2057ab2ee545561fab721cb211f7f.patch";
|
||||||
|
hash = "sha256-y1PEehFCW+69OH8YvL3SUGOb8Hhyf8xwRvSZzJ5J5Wc=";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
cmake
|
cmake
|
||||||
extra-cmake-modules
|
extra-cmake-modules
|
||||||
|
|
|
@ -13,15 +13,15 @@
|
||||||
, olm
|
, olm
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation rec {
|
||||||
pname = "quaternion";
|
pname = "quaternion";
|
||||||
version = "0.0.95.81";
|
version = "0.0.96-beta4";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "QMatrixClient";
|
owner = "quotient-im";
|
||||||
repo = "Quaternion";
|
repo = "Quaternion";
|
||||||
rev = "5f639d8c84ed1475057b2cb3f7d0cb0abe77203b";
|
rev = "refs/tags/${version}";
|
||||||
hash = "sha256-/1fich97oqSSDpfOjaYghYzHfu3MDrh77nanbIN/v/w=";
|
hash = "sha256-yItl31Ze48lRIIey+FlRLMVAkg4mHu8G1sFOceHvTJw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
@ -36,6 +36,10 @@ stdenv.mkDerivation {
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake qttools wrapQtAppsHook ];
|
nativeBuildInputs = [ cmake qttools wrapQtAppsHook ];
|
||||||
|
|
||||||
|
cmakeFlags = [
|
||||||
|
"-DBUILD_WITH_QT6=OFF"
|
||||||
|
];
|
||||||
|
|
||||||
postInstall =
|
postInstall =
|
||||||
if stdenv.isDarwin then ''
|
if stdenv.isDarwin then ''
|
||||||
mkdir -p $out/Applications
|
mkdir -p $out/Applications
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "libquotient";
|
pname = "libquotient";
|
||||||
version = "0.7.2";
|
version = "0.8.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "quotient-im";
|
owner = "quotient-im";
|
||||||
repo = "libQuotient";
|
repo = "libQuotient";
|
||||||
rev = version;
|
rev = version;
|
||||||
hash = "sha256-Lq404O2VjZ8vlXOW+rhsvWDvZsNd3APNbv6AadQCjhk=";
|
hash = "sha256-ecTHiWbsNDIUz+Sadh2pVbDRZFzdMkZXBYSjy1JqZrk=";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ olm openssl qtbase qtmultimedia qtkeychain ];
|
buildInputs = [ olm openssl qtbase qtmultimedia qtkeychain ];
|
||||||
|
|
Loading…
Reference in a new issue