Merge pull request #319406 from fgaz/nheko/0.12.0 (3027ba73) · Commits · nix / nixpkgs

pkgs/applications/networking/instant-messengers/nheko/default.nix

+10 −29

Original line number	Diff line number	Diff line
		{ lib
		, stdenv
		, fetchFromGitHub
		, fetchpatch
		, cmake
		, asciidoc
		, pkg-config
		@@ -9,6 +8,7 @@
		, cmark
		, coeurl
		, curl
		, kdsingleapplication
		, libevent
		, libsecret
		, lmdb
		@@ -17,48 +17,29 @@
		, nlohmann_json
		, olm
		, qtbase
		, qtgraphicaleffects
		, qtimageformats
		, qtkeychain
		, qtmacextras
		, qtmultimedia
		, qtquickcontrols2
		, qttools
		, qtwayland
		, re2
		, spdlog
		, wrapQtAppsHook
		, voipSupport ? true
		, gst_all_1
		, libnice
		}:

		stdenv.mkDerivation rec {
		pname = "nheko";
		version = "0.11.3";
		version = "0.12.0";

		src = fetchFromGitHub {
		owner = "Nheko-Reborn";
		repo = "nheko";
		rev = "v${version}";
		hash = "sha256-2daXxTbpSUlig47y901JOkWRxbZGH4qrvNMepJbvS3o=";
		hash = "sha256-hQb+K8ogNj/s6ZO2kgS/sZZ35y4CwMeS3lVeMYNucYQ=";
		};

		patches = [
		# The 2 following patches can be removed with the next version bump.
		# Backport of https://github.com/Nheko-Reborn/nheko/commit/e89e65dc17020772eb057414b4f0c5d6f4ad98d0.
		(fetchpatch {
		name = "nheko-fmt10.patch";
		url = "https://gitlab.archlinux.org/archlinux/packaging/packages/nheko/-/raw/1b0d5c9eff6409dfd82953f346546d36c288a4a9/nheko-0.11.3-fix-for-fmt-10.patch";
		hash = "sha256-UYqAu2iXT3Bn/MxCtybiJrJLfVMOOVRchWqrGuPfapI=";
		})
		# https://github.com/Nheko-Reborn/nheko/pull/1552
		(fetchpatch {
		name = "nheko-fmt10.1.patch";
		url = "https://github.com/Nheko-Reborn/nheko/commit/614facf93c2b5d6118beb822cc542ac53a883c37.patch";
		hash = "sha256-rjsQNDfj3Lzbv8ow3qiNozGXQFrtYLhArS6a9JCdgBQ=";
		})
		];

		nativeBuildInputs = [
		asciidoc
		cmake
		@@ -72,6 +53,7 @@ stdenv.mkDerivation rec {
		cmark
		coeurl
		curl
		kdsingleapplication
		libevent
		libsecret
		lmdb
		@@ -79,19 +61,18 @@ stdenv.mkDerivation rec {
		nlohmann_json
		olm
		qtbase
		qtgraphicaleffects
		qtimageformats
		qtkeychain
		qtmultimedia
		qtquickcontrols2
		qttools
		qtwayland
		re2
		spdlog
		] ++ lib.optional stdenv.isDarwin qtmacextras
		++ lib.optionals voipSupport (with gst_all_1; [
		]
		++ (with gst_all_1; [
		gstreamer
		gst-plugins-base
		(gst-plugins-good.override { qt5Support = true; })
		(gst-plugins-good.override { qt6Support = true; })
		gst-plugins-bad
		libnice
		]);
		@@ -100,7 +81,7 @@ stdenv.mkDerivation rec {
		"-DCOMPILE_QML=ON" # see https://github.com/Nheko-Reborn/nheko/issues/389
		];

		preFixup = lib.optionalString voipSupport ''
		preFixup = ''
		# add gstreamer plugins path to the wrapper
		qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")
		'';

pkgs/development/libraries/mtxclient/default.nix

+2 −2

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

		stdenv.mkDerivation rec {
		pname = "mtxclient";
		version = "0.9.2";
		version = "0.10.0";

		src = fetchFromGitHub {
		owner = "Nheko-Reborn";
		repo = "mtxclient";
		rev = "v${version}";
		hash = "sha256-r+bD2L5+3AwkdYa3FwsM+yf7V5w+6ZJC92CMdVeYLJQ=";
		hash = "sha256-luWcbYCv5OM3aidxiO7glqD+VYnCZMElZYaPKbtvMYI=";
		};

		postPatch = ''

pkgs/top-level/all-packages.nix

+1 −1

Original line number	Diff line number	Diff line
		@@ -33326,7 +33326,7 @@ with pkgs;
		inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Foundation;
		};

		nheko = libsForQt5.callPackage ../applications/networking/instant-messengers/nheko { };
		nheko = qt6Packages.callPackage ../applications/networking/instant-messengers/nheko { };

		notepad-next = libsForQt5.callPackage ../applications/editors/notepad-next { };

Admin message