Merge pull request #243257 from r-ryantm/auto-update/libquotient (aeee6bca) · Commits · nix / nixpkgs

pkgs/applications/kde/neochat.nix

+9 −0

Original line number	Diff line number	Diff line
		{ mkDerivation
		, lib
		, fetchpatch

		, cmake
		, extra-cmake-modules
		@@ -32,6 +33,14 @@
		mkDerivation {
		pname = "neochat";

		patches = [
		(fetchpatch {
		name = "libquotient-0.8.patch";
		url = "https://invent.kde.org/network/neochat/-/commit/d9d5e17be2a2057ab2ee545561fab721cb211f7f.patch";
		hash = "sha256-y1PEehFCW+69OH8YvL3SUGOb8Hhyf8xwRvSZzJ5J5Wc=";
		})
		];

		nativeBuildInputs = [
		cmake
		extra-cmake-modules

+9 −5

Original line number	Diff line number	Diff line
		@@ -13,15 +13,15 @@
		, olm
		}:

		stdenv.mkDerivation {
		stdenv.mkDerivation rec {
		pname = "quaternion";
		version = "0.0.95.81";
		version = "0.0.96-beta4";

		src = fetchFromGitHub {
		owner = "QMatrixClient";
		owner = "quotient-im";
		repo = "Quaternion";
		rev = "5f639d8c84ed1475057b2cb3f7d0cb0abe77203b";
		hash = "sha256-/1fich97oqSSDpfOjaYghYzHfu3MDrh77nanbIN/v/w=";
		rev = "refs/tags/${version}";
		hash = "sha256-yItl31Ze48lRIIey+FlRLMVAkg4mHu8G1sFOceHvTJw=";
		};

		buildInputs = [
		@@ -36,6 +36,10 @@ stdenv.mkDerivation {

		nativeBuildInputs = [ cmake qttools wrapQtAppsHook ];

		cmakeFlags = [
		"-DBUILD_WITH_QT6=OFF"
		];

		postInstall =
		if stdenv.isDarwin then ''
		mkdir -p $out/Applications

+2 −2

Original line number	Diff line number	Diff line
		@@ -2,13 +2,13 @@

		stdenv.mkDerivation rec {
		pname = "libquotient";
		version = "0.7.2";
		version = "0.8.0";

		src = fetchFromGitHub {
		owner = "quotient-im";
		repo = "libQuotient";
		rev = version;
		hash = "sha256-Lq404O2VjZ8vlXOW+rhsvWDvZsNd3APNbv6AadQCjhk=";
		hash = "sha256-ecTHiWbsNDIUz+Sadh2pVbDRZFzdMkZXBYSjy1JqZrk=";
		};

		buildInputs = [ olm openssl qtbase qtmultimedia qtkeychain ];