From 293e18d9c4996f5884ceeda572927682591a9b2c Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Fri, 13 Apr 2018 11:10:36 -0500 Subject: [PATCH] unixtools: fixup hexdump issue utillinux puts everything in ".bin" output. We need to use lib.getBin to get it correctly. --- pkgs/top-level/unix-tools.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix index 439395efdf5..1a2f7270e0e 100644 --- a/pkgs/top-level/unix-tools.nix +++ b/pkgs/top-level/unix-tools.nix @@ -1,4 +1,4 @@ -{ pkgs, buildEnv, runCommand, hostPlatform }: +{ pkgs, buildEnv, runCommand, hostPlatform, lib }: # These are some unix tools that are commonly included in the /usr/bin # and /usr/sbin directory under more normal distributions. Along with @@ -13,7 +13,7 @@ let singleBinary = cmd: providers: let - provider = "${providers.${hostPlatform.parsed.kernel.name} or "missing-package"}/bin/${cmd}"; + provider = "${lib.getBin providers.${hostPlatform.parsed.kernel.name}}/bin/${cmd}"; in runCommand cmd { meta.platforms = map (n: { kernel.name = n; }) (pkgs.lib.attrNames providers); } ''