pyrox.dev
Merge pull request #284535 from Lurkki14/tuxclocker-master
tuxclocker: 1.4.0 -> 1.5.0
+8
-3
pkgs/applications/misc/tuxclocker/default.nix
+8
-3
pkgs/applications/misc/tuxclocker/default.nix
···
11
11
, qtbase
12
12
, qtcharts
13
13
, tuxclocker-plugins
14
+
, tuxclocker-without-unfree
14
15
, wrapQtAppsHook
15
16
}:
16
17
17
18
stdenv.mkDerivation (finalAttrs: {
18
19
pname = "tuxclocker";
19
-
version = "1.4.0";
20
+
version = "1.5.0";
20
21
21
22
src = fetchFromGitHub {
22
23
owner = "Lurkki14";
23
24
repo = "tuxclocker";
24
25
fetchSubmodules = true;
25
-
rev = "${finalAttrs.version}";
26
-
hash = "sha256-8dtuZXBWftXNQpqYgNQOayPGfvEIu9QfbqDShfkt1qA=";
26
+
rev = finalAttrs.version;
27
+
hash = "sha256-VJchgImSGykenss4/TyLATljYMMXNmgLSMT8ixSnReA=";
27
28
};
28
29
29
30
# Meson doesn't find boost without these
···
55
56
mesonFlags = [
56
57
"-Dplugins=false"
57
58
];
59
+
60
+
passthru.tests = {
61
+
inherit tuxclocker-without-unfree;
62
+
};
58
63
59
64
meta = with lib; {
60
65
description = "Qt overclocking tool for GNU/Linux";
-14
pkgs/by-name/tu/tuxclocker-nvidia-plugin/no-cpu-plugin.patch
-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
+1
-4
pkgs/by-name/tu/tuxclocker-nvidia-plugin/package.nix
···
22
22
openssl
23
23
];
24
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
25
mesonFlags = [
30
26
"-Ddaemon=false"
31
27
"-Dgui=false"
32
28
"-Drequire-nvidia=true"
29
+
"-Dplugins-cpu=false" # provided by tuxclocker-plugins
33
30
];
34
31
}