pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #284535 from Lurkki14/tuxclocker-master

tuxclocker: 1.4.0 -> 1.5.0

authored by Sandro and committed by GitHub 3676a58f 28430903

+9 -23
unified split
+8 -3
pkgs/applications/misc/tuxclocker/default.nix
··· 11 , qtbase 12 , qtcharts 13 , tuxclocker-plugins 14 , wrapQtAppsHook 15 }: 16 17 stdenv.mkDerivation (finalAttrs: { 18 pname = "tuxclocker"; 19 - version = "1.4.0"; 20 21 src = fetchFromGitHub { 22 owner = "Lurkki14"; 23 repo = "tuxclocker"; 24 fetchSubmodules = true; 25 - rev = "${finalAttrs.version}"; 26 - hash = "sha256-8dtuZXBWftXNQpqYgNQOayPGfvEIu9QfbqDShfkt1qA="; 27 }; 28 29 # Meson doesn't find boost without these ··· 55 mesonFlags = [ 56 "-Dplugins=false" 57 ]; 58 59 meta = with lib; { 60 description = "Qt overclocking tool for GNU/Linux";
··· 11 , qtbase 12 , qtcharts 13 , tuxclocker-plugins 14 + , tuxclocker-without-unfree 15 , wrapQtAppsHook 16 }: 17 18 stdenv.mkDerivation (finalAttrs: { 19 pname = "tuxclocker"; 20 + version = "1.5.0"; 21 22 src = fetchFromGitHub { 23 owner = "Lurkki14"; 24 repo = "tuxclocker"; 25 fetchSubmodules = true; 26 + rev = finalAttrs.version; 27 + hash = "sha256-VJchgImSGykenss4/TyLATljYMMXNmgLSMT8ixSnReA="; 28 }; 29 30 # Meson doesn't find boost without these ··· 56 mesonFlags = [ 57 "-Dplugins=false" 58 ]; 59 + 60 + passthru.tests = { 61 + inherit tuxclocker-without-unfree; 62 + }; 63 64 meta = with lib; { 65 description = "Qt overclocking tool for GNU/Linux";
-14
pkgs/by-name/tu/tuxclocker-nvidia-plugin/no-cpu-plugin.patch
··· 1 - diff --git a/src/plugins/meson.build b/src/plugins/meson.build 2 - index cdd3b5b..a5a2174 100644 3 - --- a/src/plugins/meson.build 4 - +++ b/src/plugins/meson.build 5 - @@ -63,9 +63,3 @@ if all_nvidia_linux_libs 6 - install : true, 7 - link_with : libtuxclocker) 8 - endif 9 - - 10 - -shared_library('cpu', 'CPU.cpp', 'Utils.cpp', 11 - - include_directories : [incdir, fplus_inc], 12 - - install_dir : get_option('libdir') / 'tuxclocker' / 'plugins', 13 - - install : true, 14 - - link_with : libtuxclocker)
···
+1 -4
pkgs/by-name/tu/tuxclocker-nvidia-plugin/package.nix
··· 22 openssl 23 ]; 24 25 - # Build doesn't have a way to disable building the CPU plugin, which is already 26 - # provided by 'tuxclocker-plugins' 27 - patches = [ ./no-cpu-plugin.patch ]; 28 - 29 mesonFlags = [ 30 "-Ddaemon=false" 31 "-Dgui=false" 32 "-Drequire-nvidia=true" 33 ]; 34 }
··· 22 openssl 23 ]; 24 25 mesonFlags = [ 26 "-Ddaemon=false" 27 "-Dgui=false" 28 "-Drequire-nvidia=true" 29 + "-Dplugins-cpu=false" # provided by tuxclocker-plugins 30 ]; 31 }
-2
pkgs/by-name/tu/tuxclocker-plugins/package.nix
··· 3 , boost 4 , cmake 5 , gettext 6 - , git 7 , libdrm 8 , meson 9 , ninja ··· 20 21 nativeBuildInputs = [ 22 gettext 23 - git 24 meson 25 ninja 26 pkg-config
··· 3 , boost 4 , cmake 5 , gettext 6 , libdrm 7 , meson 8 , ninja ··· 19 20 nativeBuildInputs = [ 21 gettext 22 meson 23 ninja 24 pkg-config