From fb235a871aba61cebd098e22ac84b9a9061d69b3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 23 Apr 2015 01:48:21 +0200 Subject: [PATCH] mcelog 114 -> 115: major path fixes Both $out/bin/mcelog and $out/etc/mcelog/mcelog.conf now point to the correct $out/etc/mcelog. --- pkgs/os-specific/linux/mcelog/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix index 00fb4fc3892..55ab8eda9b5 100644 --- a/pkgs/os-specific/linux/mcelog/default.nix +++ b/pkgs/os-specific/linux/mcelog/default.nix @@ -1,22 +1,25 @@ { stdenv, fetchFromGitHub }: -let version = "114"; in +let version = "115"; in stdenv.mkDerivation { name = "mcelog-${version}"; src = fetchFromGitHub { - sha256 = "1blxz5ilrlh2030gxmfqlhcb53qh2bxp5nxyc97m1z8a52idjh0v"; + sha256 = "13m9y4xfd3klzj2xrwwwwg31pnjfwd0rbrr2845sf557iyqrshki"; rev = "v${version}"; repo = "mcelog"; owner = "andikleen"; }; - makeFlags = "prefix=$(out) etcprefix=$(out) DOCDIR=$(out)/share/doc"; - - preInstall = '' - mkdir -p $out/share/{doc,man/man{5,8}} + postPatch = '' + for i in mcelog.conf paths.h; do + substituteInPlace $i --replace /etc $out/etc + done + touch mcelog.conf.5 # avoid regeneration requiring Python ''; + installFlags = "DESTDIR=$(out) prefix= DOCDIR=/share/doc"; + meta = with stdenv.lib; { inherit version; description = "Log machine checks (memory, IO, and CPU hardware errors)";