From 84f22dd862242118ea8e75e7dbde3b30e4dddf99 Mon Sep 17 00:00:00 2001 From: hhm Date: Thu, 28 Feb 2019 19:55:11 -0500 Subject: toybox: install all binary links in one directory also... - removes an unused parameter - patches all shebangs, not just those in "scripts" dir - add "which" to checkInputs for debug mode tests --- pkgs/tools/misc/toybox/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/toybox/default.nix b/pkgs/tools/misc/toybox/default.nix index 5a979be249e7d..98fa06bccfd68 100644 --- a/pkgs/tools/misc/toybox/default.nix +++ b/pkgs/tools/misc/toybox/default.nix @@ -1,5 +1,5 @@ { - stdenv, lib, fetchFromGitHub, buildPackages, + stdenv, lib, fetchFromGitHub, which, enableStatic ? false, enableMinimal ? false, extraConfig ? "" @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = lib.optionals enableStatic [ stdenv.cc.libc stdenv.cc.libc.static ]; - postPatch = "patchShebangs scripts"; + postPatch = "patchShebangs ."; inherit extraConfig; passAsFile = [ "extraConfig" ]; @@ -43,12 +43,15 @@ stdenv.mkDerivation rec { make oldconfig ''; - makeFlags = [ "PREFIX=$(out)" ] ++ lib.optional enableStatic "LDFLAGS=--static"; + makeFlags = [ "PREFIX=$(out)/bin" ] ++ lib.optional enableStatic "LDFLAGS=--static"; + + installTargets = "install_flat"; # tests currently (as of 0.8.0) get stuck in an infinite loop... # ...this is fixed in latest git, so doCheck can likely be enabled for next release # see https://github.com/landley/toybox/commit/b928ec480cd73fd83511c0f5ca786d1b9f3167c3 #doCheck = true; + checkInputs = [ which ]; # used for tests with checkFlags = [ "DEBUG=true" ]; checkTarget = "tests"; meta = with stdenv.lib; { -- cgit 1.4.1