From dfbbf249b7d2ea3faf112715a1d5be4391b03231 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= Date: Mon, 29 Aug 2022 08:18:32 +0000 Subject: [PATCH] cpu-x: 4.3.1 -> 4.4.0 --- pkgs/applications/misc/cpu-x/default.nix | 28 +++++++++++++++++++----- 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/cpu-x/default.nix b/pkgs/applications/misc/cpu-x/default.nix index 388d166c5814..195dcb3bc016 100644 --- a/pkgs/applications/misc/cpu-x/default.nix +++ b/pkgs/applications/misc/cpu-x/default.nix @@ -1,32 +1,48 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, gtk3, ncurses -, libcpuid, pciutils, procps, wrapGAppsHook, nasm, makeWrapper }: +, libcpuid, pciutils, procps, wrapGAppsHook, nasm, makeWrapper +, opencl-headers, ocl-icd +, vulkan-headers, vulkan-loader, glfw +, libXdmcp, pcre, util-linux +, libselinux, libsepol +, libthai, libdatrie, libxkbcommon, libepoxy +, dbus, at-spi2-core +, libXtst +}: stdenv.mkDerivation rec { pname = "cpu-x"; - version = "4.3.1"; + version = "4.4.0"; src = fetchFromGitHub { owner = "X0rg"; repo = "CPU-X"; rev = "v${version}"; - sha256 = "sha256-9oRNyspFmvIG63aJ8qyaVmi1GW1eW+Rg0+z8la3LuKA="; + sha256 = "sha256-PNfEiin4Hble/H8cOvSK+A7wmoeOlyITRUTwGTd3B6s="; }; nativeBuildInputs = [ cmake pkg-config wrapGAppsHook nasm makeWrapper ]; buildInputs = [ gtk3 ncurses libcpuid pciutils procps + vulkan-headers vulkan-loader glfw + opencl-headers ocl-icd + libXdmcp pcre util-linux + libselinux libsepol + libthai libdatrie libxkbcommon libepoxy + dbus at-spi2-core + libXtst ]; postInstall = '' wrapProgram $out/bin/cpu-x \ - --prefix PATH : ${lib.makeBinPath [ stdenv.cc ]} + --prefix PATH : ${lib.makeBinPath [ stdenv.cc ]} \ + --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib ''; meta = with lib; { description = "Free software that gathers information on CPU, motherboard and more"; homepage = src.meta.homepage; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ viraptor ]; }; }