Skip to content

Commit

Permalink
Merge pull request #86446 from gnidorah/cpu-x
Browse files Browse the repository at this point in the history
cpu-x: init at 3.2.4
  • Loading branch information
Lassulus authored May 12, 2020
2 parents ebeea74 + 671d1ed commit 8c9e7a7
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 0 deletions.
27 changes: 27 additions & 0 deletions pkgs/applications/misc/cpu-x/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, gtk3, ncurses, curl
, json_c, libcpuid, pciutils, procps, wrapGAppsHook, nasm }:

stdenv.mkDerivation rec {
pname = "cpu-x";
version = "3.2.4";

src = fetchFromGitHub {
owner = "X0rg";
repo = "CPU-X";
rev = "v${version}";
sha256 = "03y49wh9v7x6brmavj5a2clihn0z4f01pypl7m8ymarv4y3a6xkl";
};

nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook nasm ];
buildInputs = [
gtk3 ncurses curl json_c libcpuid pciutils procps
];

meta = with stdenv.lib; {
description = "Free software that gathers information on CPU, motherboard and more";
homepage = src.meta.homepage;
license = licenses.gpl3;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ gnidorah ];
};
}
2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,8 @@ in

colorz = callPackage ../tools/misc/colorz { };

cpu-x = callPackage ../applications/misc/cpu-x { };

dhallToNix = callPackage ../build-support/dhall-to-nix.nix {
inherit dhall-nix;
};
Expand Down

0 comments on commit 8c9e7a7

Please sign in to comment.