Commit 284ed7b9 authored by Jussi Kuokkanen's avatar Jussi Kuokkanen
Browse files

tuxclocker: 1.4.0 -> 1.5.0

parent e63efbf4
Loading
Loading
Loading
Loading
+8 −3
Original line number Diff line number Diff line
@@ -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";
+0 −14
Original line number Diff line number Diff line
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)
+1 −4
Original line number Diff line number Diff line
@@ -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
  ];
}
+0 −2
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@
, boost
, cmake
, gettext
, git
, libdrm
, meson
, ninja
@@ -20,7 +19,6 @@ stdenv.mkDerivation {

  nativeBuildInputs = [
    gettext
    git
    meson
    ninja
    pkg-config