diff options
| author | Graham Christensen <graham@grahamc.com> | 2016-08-31 08:16:57 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-31 08:16:57 -0400 |
| commit | 24f79464899a7db23886f148781374630e201912 (patch) | |
| tree | c3a6f5cd58f653665ce29a5aeb62dd7f6ade2037 /pkgs | |
| parent | 448efbacfa06de1f6fed4f5b36e90155891fa870 (diff) | |
| parent | bbafdefd86c7d534c49529d057d5183c3981b0a6 (diff) | |
Merge pull request #18154 from womfoo/fix/mbpfan-buffer-overflow
mbpfan: include buffer overflow patch
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/os-specific/linux/mbpfan/default.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/mbpfan/default.nix b/pkgs/os-specific/linux/mbpfan/default.nix index 54de1e1108c29..4866c3d813276 100644 --- a/pkgs/os-specific/linux/mbpfan/default.nix +++ b/pkgs/os-specific/linux/mbpfan/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, gnugrep, kmod }: +{ stdenv, lib, fetchFromGitHub, fetchpatch, gnugrep, kmod }: stdenv.mkDerivation rec { name = "mbpfan-${version}"; @@ -9,7 +9,12 @@ stdenv.mkDerivation rec { rev = "v${version}"; sha256 = "0issn5233h2nclrmh2jzyy5y0dyyd57f1ia7gvs3bys95glcm2s5"; }; - patches = [ ./fixes.patch ]; + 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' \ |