diff options
| author | Lassulus <github@lassul.us> | 2020-05-13 00:56:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-13 00:56:06 +0200 |
| commit | 8c9e7a7c7ec280f5acb496ab5ac717d82ccdf1e0 (patch) | |
| tree | 41848ec1b0b080721b491d45a4434283f3a67dab /pkgs | |
| parent | ebeea7497e5d09f47ff7f81d9a11d4ad4f72d985 (diff) | |
| parent | 671d1ed636d643a583df5514312af93400eb94df (diff) | |
| download | nixpkgs-8c9e7a7c7ec280f5acb496ab5ac717d82ccdf1e0.tar nixpkgs-8c9e7a7c7ec280f5acb496ab5ac717d82ccdf1e0.tar.gz nixpkgs-8c9e7a7c7ec280f5acb496ab5ac717d82ccdf1e0.tar.bz2 nixpkgs-8c9e7a7c7ec280f5acb496ab5ac717d82ccdf1e0.tar.lz nixpkgs-8c9e7a7c7ec280f5acb496ab5ac717d82ccdf1e0.tar.xz nixpkgs-8c9e7a7c7ec280f5acb496ab5ac717d82ccdf1e0.tar.zst nixpkgs-8c9e7a7c7ec280f5acb496ab5ac717d82ccdf1e0.zip | |
Merge pull request #86446 from gnidorah/cpu-x
cpu-x: init at 3.2.4
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/misc/cpu-x/default.nix | 27 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 29 insertions, 0 deletions
diff --git a/pkgs/applications/misc/cpu-x/default.nix b/pkgs/applications/misc/cpu-x/default.nix new file mode 100644 index 00000000000..c058e6d5a98 --- /dev/null +++ b/pkgs/applications/misc/cpu-x/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a22878b284e..b992d65d62b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; }; |