diff options
| author | Bjørn Forsman <bjorn.forsman@gmail.com> | 2016-09-01 17:01:00 +0200 |
|---|---|---|
| committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2016-09-06 20:30:47 +0200 |
| commit | 2bf421d197564ce728f9636e237976f5590c71d8 (patch) | |
| tree | 1bf24cd2a73c7a890297fa369221c54ed3d920fb /pkgs | |
| parent | 28e378d462e65d66f7cbb333487068c95c904164 (diff) | |
| download | nixpkgs-2bf421d197564ce728f9636e237976f5590c71d8.tar nixpkgs-2bf421d197564ce728f9636e237976f5590c71d8.tar.gz nixpkgs-2bf421d197564ce728f9636e237976f5590c71d8.tar.bz2 nixpkgs-2bf421d197564ce728f9636e237976f5590c71d8.tar.lz nixpkgs-2bf421d197564ce728f9636e237976f5590c71d8.tar.xz nixpkgs-2bf421d197564ce728f9636e237976f5590c71d8.tar.zst nixpkgs-2bf421d197564ce728f9636e237976f5590c71d8.zip | |
mcelog: add utillinux as dependency
Fixes this: $ sudo mcelog ... unknown-error-trigger: line 21: logger: command not found unknown-error-trigger: line 22: logger: command not found
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/os-specific/linux/mcelog/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix index 2d743035e14..f9969fa79fd 100644 --- a/pkgs/os-specific/linux/mcelog/default.nix +++ b/pkgs/os-specific/linux/mcelog/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, utillinux }: stdenv.mkDerivation rec { name = "mcelog-${version}"; @@ -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; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5bc36f9b828..ce7a23579ea 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -908,7 +908,9 @@ in mstflint = callPackage ../tools/misc/mstflint { }; - mcelog = callPackage ../os-specific/linux/mcelog { }; + mcelog = callPackage ../os-specific/linux/mcelog { + utillinux = utillinuxMinimal; + }; apparix = callPackage ../tools/misc/apparix { }; |