3
0
Fork 0
forked from mirrors/nixpkgs

Merge pull request #28109 from womfoo/bump/mbpfan-2.0.1

mbpfan: 1.9.1 -> 2.0.1
This commit is contained in:
Jörg Thalheim 2017-08-10 21:22:18 +01:00 committed by GitHub
commit 637cea679d
2 changed files with 2 additions and 42 deletions

View file

@ -2,24 +2,13 @@
stdenv.mkDerivation rec {
name = "mbpfan-${version}";
version = "1.9.1";
version = "2.0.1";
src = fetchFromGitHub {
owner = "dgraziotin";
repo = "mbpfan";
rev = "v${version}";
sha256 = "0issn5233h2nclrmh2jzyy5y0dyyd57f1ia7gvs3bys95glcm2s5";
sha256 = "1iri1py9ym0zz7fcacbf0d9y3i3ay77jmajckchagamkfha16zyp";
};
patches = [
./fixes.patch
(fetchpatch { # buffer overflow fix https://github.com/dgraziotin/mbpfan/issues/72
url = https://github.com/dgraziotin/mbpfan/commit/f2736c8ab93cafffc25b86bcc6c33e6cbd537243.patch;
sha256 = "10sldc69c91qk3hq0f6r3gxay38l2iw93nl85qh94mwpb8hy92yj"; })
];
postPatch = ''
substituteInPlace src/main.c \
--replace '@GREP@' '${gnugrep}/bin/grep' \
--replace '@LSMOD@' '${kmod}/bin/lsmod'
'';
installPhase = ''
mkdir -p $out/bin $out/etc
cp bin/mbpfan $out/bin

View file

@ -1,29 +0,0 @@
diff --git a/src/main.c b/src/main.c
index e8af708..6cfee17 100644
--- a/src/main.c
+++ b/src/main.c
@@ -71,7 +71,7 @@ void check_requirements()
* Check for coretemp and applesmc modules
* Credits: -http://stackoverflow.com/questions/12978794
*/
- FILE *fd = popen("lsmod | grep coretemp", "r");
+ FILE *fd = popen("@LSMOD@ | @GREP@ coretemp", "r");
char buf[16];
if (!(fread (buf, 1, sizeof (buf), fd) > 0)) {
@@ -87,7 +87,7 @@ void check_requirements()
pclose(fd);
- fd = popen("lsmod | grep applesmc", "r");
+ fd = popen("@LSMOD@ | @GREP@ applesmc", "r");
if (!(fread (buf, 1, sizeof (buf), fd) > 0)) {
DIR* dir = opendir(APPLESMC_PATH);
@@ -145,4 +145,4 @@ int main(int argc, char *argv[])
void (*fan_control)() = mbpfan;
go_daemon(fan_control);
exit(EXIT_SUCCESS);
-}
\ No newline at end of file
+}