lol

Merge pull request #188810 from viraptor/cpu-x-update

cpu-x: 4.3.1 -> 4.4.0

authored by

Stanisław Pitucha and committed by
GitHub
e6dcce99 24b83252

+22 -6
+22 -6
pkgs/applications/misc/cpu-x/default.nix
··· 1 1 { lib, stdenv, fetchFromGitHub, cmake, pkg-config, gtk3, ncurses 2 - , libcpuid, pciutils, procps, wrapGAppsHook, nasm, makeWrapper }: 2 + , libcpuid, pciutils, procps, wrapGAppsHook, nasm, makeWrapper 3 + , opencl-headers, ocl-icd 4 + , vulkan-headers, vulkan-loader, glfw 5 + , libXdmcp, pcre, util-linux 6 + , libselinux, libsepol 7 + , libthai, libdatrie, libxkbcommon, libepoxy 8 + , dbus, at-spi2-core 9 + , libXtst 10 + }: 3 11 4 12 stdenv.mkDerivation rec { 5 13 pname = "cpu-x"; 6 - version = "4.3.1"; 14 + version = "4.4.0"; 7 15 8 16 src = fetchFromGitHub { 9 17 owner = "X0rg"; 10 18 repo = "CPU-X"; 11 19 rev = "v${version}"; 12 - sha256 = "sha256-9oRNyspFmvIG63aJ8qyaVmi1GW1eW+Rg0+z8la3LuKA="; 20 + sha256 = "sha256-PNfEiin4Hble/H8cOvSK+A7wmoeOlyITRUTwGTd3B6s="; 13 21 }; 14 22 15 23 nativeBuildInputs = [ cmake pkg-config wrapGAppsHook nasm makeWrapper ]; 16 24 buildInputs = [ 17 25 gtk3 ncurses libcpuid pciutils procps 26 + vulkan-headers vulkan-loader glfw 27 + opencl-headers ocl-icd 28 + libXdmcp pcre util-linux 29 + libselinux libsepol 30 + libthai libdatrie libxkbcommon libepoxy 31 + dbus at-spi2-core 32 + libXtst 18 33 ]; 19 34 20 35 postInstall = '' 21 36 wrapProgram $out/bin/cpu-x \ 22 - --prefix PATH : ${lib.makeBinPath [ stdenv.cc ]} 37 + --prefix PATH : ${lib.makeBinPath [ stdenv.cc ]} \ 38 + --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib 23 39 ''; 24 40 25 41 meta = with lib; { 26 42 description = "Free software that gathers information on CPU, motherboard and more"; 27 43 homepage = src.meta.homepage; 28 - license = licenses.gpl3; 44 + license = licenses.gpl3Plus; 29 45 platforms = [ "x86_64-linux" ]; 30 - maintainers = with maintainers; [ ]; 46 + maintainers = with maintainers; [ viraptor ]; 31 47 }; 32 48 }