Merge pull request #316912 from JohnRTitor/ananicy-cpp-patch (0e2ddadf) · Commits · mdf / nixpkgs

pkgs/misc/ananicy-cpp/default.nix→pkgs/by-name/an/ananicy-cpp/package.nix

+20 −4

Original line number	Diff line number	Diff line
		{ lib
		, clangStdenv
		, fetchFromGitLab
		, fetchpatch
		, cmake
		, pkg-config
		, spdlog
		@@ -9,6 +10,7 @@
		, libbpf
		, elfutils
		, bpftools
		, pcre2
		, zlib
		}:

		@@ -24,6 +26,15 @@ clangStdenv.mkDerivation rec {
		sha256 = "sha256-oPinSc00+Z6SxjfTh7DttcXSjsLv1X0NI+O37C8M8GY=";
		};

		patches = [
		# FIXME: remove this when updating to next stable release
		(fetchpatch {
		name = "allow-regex-pattern-matching.patch";
		url = "https://gitlab.com/ananicy-cpp/ananicy-cpp/-/commit/6ea2dccceec39b6c4913f617dad81d859aa20f24.patch";
		hash = "sha256-C+7x/VpVwewXEPwibi7GxGfjuhDkhcjTyGbZHlYL2Bs=";
		})
		];

		strictDeps = true;

		nativeBuildInputs = [
		@@ -33,6 +44,7 @@ clangStdenv.mkDerivation rec {
		];

		buildInputs = [
		pcre2
		spdlog
		nlohmann_json
		systemd
		@@ -51,6 +63,7 @@ clangStdenv.mkDerivation rec {
		"-DUSE_BPF_PROC_IMPL=ON"
		"-DBPF_BUILD_LIBBPF=OFF"
		"-DENABLE_SYSTEMD=ON"
		"-DENABLE_REGEX_SUPPORT=ON"
		"-DVERSION=${version}"
		];

		@@ -59,12 +72,15 @@ clangStdenv.mkDerivation rec {
		rm -rf "$out"/lib/cmake
		'';

		meta = with lib; {
		meta = {
		homepage = "https://gitlab.com/ananicy-cpp/ananicy-cpp";
		description = "Rewrite of ananicy in c++ for lower cpu and memory usage";
		license = licenses.gpl3Only;
		platforms = platforms.linux;
		maintainers = with maintainers; [ artturin ];
		license = lib.licenses.gpl3Only;
		platforms = lib.platforms.linux;
		maintainers = with lib.maintainers; [
		artturin
		johnrtitor
		];
		mainProgram = "ananicy-cpp";
		};
		}

+0 −2

Original line number	Diff line number	Diff line
		@@ -28203,8 +28203,6 @@ with pkgs;

		ananicy = callPackage ../misc/ananicy { };

		ananicy-cpp = callPackage ../misc/ananicy-cpp { };

		andagii = callPackage ../data/fonts/andagii { };

		andika = callPackage ../data/fonts/andika { };