-
-
Notifications
You must be signed in to change notification settings - Fork 14k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge staging-next-24.05 into staging-24.05
- Loading branch information
Showing
16 changed files
with
2,390 additions
and
113 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,54 +1,105 @@ | ||
| { lib, stdenv, fetchFromGitHub, cmake, pkg-config, gtk3, ncurses | ||
| , libcpuid, pciutils, procps, wrapGAppsHook3, 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 | ||
| { | ||
| lib, | ||
| testers, | ||
| stdenv, | ||
| fetchFromGitHub, | ||
| cmake, | ||
| pkg-config, | ||
| gtk3, | ||
| ncurses, | ||
| libcpuid, | ||
| pciutils, | ||
| procps, | ||
| wrapGAppsHook3, | ||
| nasm, | ||
| opencl-headers, | ||
| ocl-icd, | ||
| vulkan-headers, | ||
| vulkan-loader, | ||
| glfw, | ||
| libXdmcp, | ||
| pcre, | ||
| util-linux, | ||
| libselinux, | ||
| libsepol, | ||
| libthai, | ||
| libdatrie, | ||
| libxkbcommon, | ||
| libepoxy, | ||
| dbus, | ||
| at-spi2-core, | ||
| libXtst, | ||
| gtkmm3, | ||
| }: | ||
|
|
||
| # Known issues: | ||
| # - The daemon can't be started from the GUI, because pkexec requires a shell | ||
| # registered in /etc/shells. The nix's bash is not in there when running | ||
| # cpu-x from nixpkgs. | ||
|
|
||
| stdenv.mkDerivation rec { | ||
| stdenv.mkDerivation (finalAttrs: { | ||
| pname = "cpu-x"; | ||
| version = "5.0.4"; | ||
|
|
||
| src = fetchFromGitHub { | ||
| owner = "X0rg"; | ||
| repo = "CPU-X"; | ||
| rev = "v${version}"; | ||
| sha256 = "sha256-8jJP0gxH3B6qLrhKNa4P9ZfSjxaXTeBB1+UuadflLQo="; | ||
| rev = "refs/tags/v${finalAttrs.version}"; | ||
| hash = "sha256-8jJP0gxH3B6qLrhKNa4P9ZfSjxaXTeBB1+UuadflLQo="; | ||
| }; | ||
|
|
||
| nativeBuildInputs = [ cmake pkg-config wrapGAppsHook3 nasm makeWrapper ]; | ||
| nativeBuildInputs = [ | ||
| cmake | ||
| pkg-config | ||
| wrapGAppsHook3 | ||
| nasm | ||
| ]; | ||
|
|
||
| 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 | ||
| gtk3 | ||
| gtkmm3 | ||
| 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 ]} \ | ||
| preFixup = '' | ||
| gappsWrapperArgs+=( | ||
| --prefix PATH : ${lib.makeBinPath [ stdenv.cc ]} | ||
| --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib | ||
| ) | ||
| ''; | ||
|
|
||
| meta = with lib; { | ||
| passthru = { | ||
| tests = { | ||
| version = testers.testVersion { package = finalAttrs.finalPackage; }; | ||
| }; | ||
| }; | ||
|
|
||
| meta = { | ||
| description = "Free software that gathers information on CPU, motherboard and more"; | ||
| mainProgram = "cpu-x"; | ||
| homepage = "https://thetumultuousunicornofdarkness.github.io/CPU-X"; | ||
| license = licenses.gpl3Plus; | ||
| license = lib.licenses.gpl3Plus; | ||
| platforms = [ "x86_64-linux" ]; | ||
| maintainers = with maintainers; [ viraptor ]; | ||
| maintainers = with lib.maintainers; [ viraptor ]; | ||
| }; | ||
| } | ||
| }) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| { | ||
| lib, | ||
| stdenv, | ||
| fetchFromGitHub, | ||
| cmake, | ||
| pkg-config, | ||
| curl, | ||
| boost, | ||
| liboauth, | ||
| jsoncpp, | ||
| htmlcxx, | ||
| rhash, | ||
| tinyxml-2, | ||
| help2man, | ||
| html-tidy, | ||
| libsForQt5, | ||
| testers, | ||
| lgogdownloader, | ||
|
|
||
| enableGui ? true, | ||
| }: | ||
|
|
||
| stdenv.mkDerivation rec { | ||
| pname = "lgogdownloader"; | ||
| version = "3.15"; | ||
|
|
||
| src = fetchFromGitHub { | ||
| owner = "Sude-"; | ||
| repo = "lgogdownloader"; | ||
| rev = "refs/tags/v${version}"; | ||
| hash = "sha256-h2N5pRwwZZ3jAvRrT4Ebk4N5WO9tQjDrp8KRqriwUi4="; | ||
| }; | ||
|
|
||
| nativeBuildInputs = [ | ||
| cmake | ||
| pkg-config | ||
| help2man | ||
| html-tidy | ||
| ] ++ lib.optional enableGui libsForQt5.wrapQtAppsHook; | ||
|
|
||
| buildInputs = | ||
| [ | ||
| boost | ||
| curl | ||
| htmlcxx | ||
| jsoncpp | ||
| liboauth | ||
| rhash | ||
| tinyxml-2 | ||
| ] | ||
| ++ lib.optionals enableGui [ | ||
| libsForQt5.qtbase | ||
| libsForQt5.qtwebengine | ||
| ]; | ||
|
|
||
| cmakeFlags = lib.optional enableGui "-DUSE_QT_GUI=ON"; | ||
|
|
||
| passthru.tests = { | ||
| version = testers.testVersion { package = lgogdownloader; }; | ||
| }; | ||
|
|
||
| meta = { | ||
| description = "Unofficial downloader to GOG.com for Linux users. It uses the same API as the official GOGDownloader"; | ||
| mainProgram = "lgogdownloader"; | ||
| homepage = "https://github.com/Sude-/lgogdownloader"; | ||
| license = lib.licenses.wtfpl; | ||
| maintainers = with lib.maintainers; [ _0x4A6F ]; | ||
| platforms = lib.platforms.linux; | ||
| }; | ||
| } |
Oops, something went wrong.