diff options
| author | Parnell Springmeyer <parnell@digitalmentat.com> | 2017-01-25 11:08:05 -0800 |
|---|---|---|
| committer | Parnell Springmeyer <parnell@digitalmentat.com> | 2017-01-25 11:08:05 -0800 |
| commit | bae00e8aa8f3faff90e28e19cd5074b8c26d0d0e (patch) | |
| tree | 56abaf30f11ad2f24b9fb7729f74c5fff50fbd93 /pkgs/os-specific/linux/mcelog/default.nix | |
| parent | 1f9494b752082ec3ac048e56d1c6364a2e23a675 (diff) | |
| parent | 104c3db6594043dbb81005303f055b02145305a5 (diff) | |
| download | nixpkgs-bae00e8aa8f3faff90e28e19cd5074b8c26d0d0e.tar nixpkgs-bae00e8aa8f3faff90e28e19cd5074b8c26d0d0e.tar.gz nixpkgs-bae00e8aa8f3faff90e28e19cd5074b8c26d0d0e.tar.bz2 nixpkgs-bae00e8aa8f3faff90e28e19cd5074b8c26d0d0e.tar.lz nixpkgs-bae00e8aa8f3faff90e28e19cd5074b8c26d0d0e.tar.xz nixpkgs-bae00e8aa8f3faff90e28e19cd5074b8c26d0d0e.tar.zst nixpkgs-bae00e8aa8f3faff90e28e19cd5074b8c26d0d0e.zip | |
setcap-wrapper: Merging with upstream master and resolving conflicts
Diffstat (limited to 'pkgs/os-specific/linux/mcelog/default.nix')
| -rw-r--r-- | pkgs/os-specific/linux/mcelog/default.nix | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix index 2d743035e14..dee201c1778 100644 --- a/pkgs/os-specific/linux/mcelog/default.nix +++ b/pkgs/os-specific/linux/mcelog/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, utillinux }: stdenv.mkDerivation rec { name = "mcelog-${version}"; - version = "138"; + version = "144"; src = fetchFromGitHub { - sha256 = "039ycn5m3gx4n0kppxl35wcrkyva6lv64qhlqhh7034qkbqbhqiy"; + sha256 = "05b1x9z6x9yz3xmb93qvwwssjbvp28bawy8as9bfm29pyhzdxx6k"; rev = "v${version}"; repo = "mcelog"; owner = "andikleen"; @@ -18,6 +18,10 @@ stdenv.mkDerivation rec { touch mcelog.conf.5 # avoid regeneration requiring Python substituteInPlace Makefile --replace '"unknown"' '"${version}"' + + for i in triggers/*; do + substituteInPlace $i --replace 'logger' '${utillinux}/bin/logger' + done ''; enableParallelBuilding = true; |