From c3a562f3e2affed5b583230a63841fe9191cd193 Mon Sep 17 00:00:00 2001 From: Christine Koppelt Date: Wed, 25 Sep 2019 00:33:22 +0200 Subject: [PATCH] addressing remarks from @peterhoeg ( thinkfan: 0.9.3 -> 1.0.2) --- pkgs/tools/system/thinkfan/default.nix | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/pkgs/tools/system/thinkfan/default.nix b/pkgs/tools/system/thinkfan/default.nix index f5a8a48c9f2..60d47dab20e 100644 --- a/pkgs/tools/system/thinkfan/default.nix +++ b/pkgs/tools/system/thinkfan/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmakeCurses, libyamlcpp, pkgconfig +{ stdenv, fetchFromGitHub, cmake, libyamlcpp, pkgconfig , smartSupport ? false, libatasmart }: stdenv.mkDerivation rec { @@ -12,18 +12,14 @@ stdenv.mkDerivation rec { sha256 = "107vw0962hrwva3wra9n3hxlbfzg82ldc10qssv3dspja88g8psr"; }; - configureFlags = [ + cmakeFlags = [ "-DCMAKE_INSTALL_DOCDIR=share/doc/${pname}" "-DUSE_NVML=OFF" - "-DUSE_ATASMART=ON" - "-DUSE_YAML=ON" - ]; + ] ++ stdenv.lib.optional smartSupport "-DUSE_ATASMART=ON"; - nativeBuildInputs = [ cmakeCurses pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [libyamlcpp] ++ stdenv.lib.optional smartSupport libatasmart; - - cmakeFlags = stdenv.lib.optional smartSupport "-DUSE_ATASMART=ON"; + buildInputs = [ libyamlcpp ] ++ stdenv.lib.optional smartSupport libatasmart; installPhase = '' install -Dm755 {.,$out/bin}/thinkfan @@ -34,10 +30,10 @@ stdenv.mkDerivation rec { install -Dm644 {src,$out/share/man/man1}/thinkfan.1 ''; - meta = { - license = stdenv.lib.licenses.gpl3; - homepage = https://github.com/vmatare/thinkfan; - maintainers = with stdenv.lib.maintainers; [ domenkozar ]; - platforms = stdenv.lib.platforms.linux; + meta = with stdenv.lib; { + license = licenses.gpl3; + homepage = "https://github.com/vmatare/thinkfan"; + maintainers = with maintainers; [ domenkozar ]; + platforms = platforms.linux; }; }