addressing remarks from @peterhoeg ( thinkfan: 0.9.3 -> 1.0.2)

This commit is contained in:
Christine Koppelt 2019-09-25 00:33:22 +02:00
parent 482a9537b2
commit c3a562f3e2

View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmakeCurses, libyamlcpp, pkgconfig { stdenv, fetchFromGitHub, cmake, libyamlcpp, pkgconfig
, smartSupport ? false, libatasmart }: , smartSupport ? false, libatasmart }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -12,19 +12,15 @@ stdenv.mkDerivation rec {
sha256 = "107vw0962hrwva3wra9n3hxlbfzg82ldc10qssv3dspja88g8psr"; sha256 = "107vw0962hrwva3wra9n3hxlbfzg82ldc10qssv3dspja88g8psr";
}; };
configureFlags = [ cmakeFlags = [
"-DCMAKE_INSTALL_DOCDIR=share/doc/${pname}" "-DCMAKE_INSTALL_DOCDIR=share/doc/${pname}"
"-DUSE_NVML=OFF" "-DUSE_NVML=OFF"
"-DUSE_ATASMART=ON" ] ++ stdenv.lib.optional smartSupport "-DUSE_ATASMART=ON";
"-DUSE_YAML=ON"
];
nativeBuildInputs = [ cmakeCurses pkgconfig ]; nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ libyamlcpp ] ++ stdenv.lib.optional smartSupport libatasmart; buildInputs = [ libyamlcpp ] ++ stdenv.lib.optional smartSupport libatasmart;
cmakeFlags = stdenv.lib.optional smartSupport "-DUSE_ATASMART=ON";
installPhase = '' installPhase = ''
install -Dm755 {.,$out/bin}/thinkfan install -Dm755 {.,$out/bin}/thinkfan
@ -34,10 +30,10 @@ stdenv.mkDerivation rec {
install -Dm644 {src,$out/share/man/man1}/thinkfan.1 install -Dm644 {src,$out/share/man/man1}/thinkfan.1
''; '';
meta = { meta = with stdenv.lib; {
license = stdenv.lib.licenses.gpl3; license = licenses.gpl3;
homepage = https://github.com/vmatare/thinkfan; homepage = "https://github.com/vmatare/thinkfan";
maintainers = with stdenv.lib.maintainers; [ domenkozar ]; maintainers = with maintainers; [ domenkozar ];
platforms = stdenv.lib.platforms.linux; platforms = platforms.linux;
}; };
} }