diff options
| author | Jussi Kuokkanen <jussi.kuokkanen@protonmail.com> | 2024-01-28 16:28:36 +0200 |
|---|---|---|
| committer | Jussi Kuokkanen <jussi.kuokkanen@protonmail.com> | 2024-01-31 15:40:32 +0200 |
| commit | 284ed7b9144f06ead7746013d52ed8705ef4a2f3 (patch) | |
| tree | c2795f42241a296c3b07b27336503e18ccf46eb9 /pkgs | |
| parent | e63efbf4e95d3ea3c147617e41cee3fb1dee5587 (diff) | |
| download | nixlib-284ed7b9144f06ead7746013d52ed8705ef4a2f3.tar nixlib-284ed7b9144f06ead7746013d52ed8705ef4a2f3.tar.gz nixlib-284ed7b9144f06ead7746013d52ed8705ef4a2f3.tar.bz2 nixlib-284ed7b9144f06ead7746013d52ed8705ef4a2f3.tar.lz nixlib-284ed7b9144f06ead7746013d52ed8705ef4a2f3.tar.xz nixlib-284ed7b9144f06ead7746013d52ed8705ef4a2f3.tar.zst nixlib-284ed7b9144f06ead7746013d52ed8705ef4a2f3.zip | |
tuxclocker: 1.4.0 -> 1.5.0
Diffstat (limited to 'pkgs')
4 files changed, 9 insertions, 23 deletions
diff --git a/pkgs/applications/misc/tuxclocker/default.nix b/pkgs/applications/misc/tuxclocker/default.nix index 5592c8e2cdec..4b264fd10bf4 100644 --- a/pkgs/applications/misc/tuxclocker/default.nix +++ b/pkgs/applications/misc/tuxclocker/default.nix @@ -11,19 +11,20 @@ , qtbase , qtcharts , tuxclocker-plugins +, tuxclocker-without-unfree , wrapQtAppsHook }: stdenv.mkDerivation (finalAttrs: { pname = "tuxclocker"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "Lurkki14"; repo = "tuxclocker"; fetchSubmodules = true; - rev = "${finalAttrs.version}"; - hash = "sha256-8dtuZXBWftXNQpqYgNQOayPGfvEIu9QfbqDShfkt1qA="; + rev = finalAttrs.version; + hash = "sha256-VJchgImSGykenss4/TyLATljYMMXNmgLSMT8ixSnReA="; }; # Meson doesn't find boost without these @@ -56,6 +57,10 @@ stdenv.mkDerivation (finalAttrs: { "-Dplugins=false" ]; + passthru.tests = { + inherit tuxclocker-without-unfree; + }; + meta = with lib; { description = "Qt overclocking tool for GNU/Linux"; homepage = "https://github.com/Lurkki14/tuxclocker"; diff --git a/pkgs/by-name/tu/tuxclocker-nvidia-plugin/no-cpu-plugin.patch b/pkgs/by-name/tu/tuxclocker-nvidia-plugin/no-cpu-plugin.patch deleted file mode 100644 index d6d864fb9789..000000000000 --- a/pkgs/by-name/tu/tuxclocker-nvidia-plugin/no-cpu-plugin.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/plugins/meson.build b/src/plugins/meson.build -index cdd3b5b..a5a2174 100644 ---- a/src/plugins/meson.build -+++ b/src/plugins/meson.build -@@ -63,9 +63,3 @@ if all_nvidia_linux_libs - install : true, - link_with : libtuxclocker) - endif -- --shared_library('cpu', 'CPU.cpp', 'Utils.cpp', -- include_directories : [incdir, fplus_inc], -- install_dir : get_option('libdir') / 'tuxclocker' / 'plugins', -- install : true, -- link_with : libtuxclocker) diff --git a/pkgs/by-name/tu/tuxclocker-nvidia-plugin/package.nix b/pkgs/by-name/tu/tuxclocker-nvidia-plugin/package.nix index dac3b342c4c2..b783953acd93 100644 --- a/pkgs/by-name/tu/tuxclocker-nvidia-plugin/package.nix +++ b/pkgs/by-name/tu/tuxclocker-nvidia-plugin/package.nix @@ -22,13 +22,10 @@ stdenv.mkDerivation { openssl ]; - # Build doesn't have a way to disable building the CPU plugin, which is already - # provided by 'tuxclocker-plugins' - patches = [ ./no-cpu-plugin.patch ]; - mesonFlags = [ "-Ddaemon=false" "-Dgui=false" "-Drequire-nvidia=true" + "-Dplugins-cpu=false" # provided by tuxclocker-plugins ]; } diff --git a/pkgs/by-name/tu/tuxclocker-plugins/package.nix b/pkgs/by-name/tu/tuxclocker-plugins/package.nix index 19c8fa52441b..12deedd5c56f 100644 --- a/pkgs/by-name/tu/tuxclocker-plugins/package.nix +++ b/pkgs/by-name/tu/tuxclocker-plugins/package.nix @@ -3,7 +3,6 @@ , boost , cmake , gettext -, git , libdrm , meson , ninja @@ -20,7 +19,6 @@ stdenv.mkDerivation { nativeBuildInputs = [ gettext - git meson ninja pkg-config |