public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

toybox: install all binary links in one directory

Browse Source 
also...
- removes an unused parameter
- patches all shebangs, not just those in "scripts" dir
- add "which" to checkInputs for debug mode tests
This commit is contained in:
hhm 2019-02-28 19:55:11 -05:00
parent 898870824d
commit 84f22dd862
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/tools/misc/toybox/default.nix
View File

@ -1,5 +1,5 @@
{ {
stdenv, lib, fetchFromGitHub, buildPackages, stdenv, lib, fetchFromGitHub, which,
enableStatic ? false, enableStatic ? false,
enableMinimal ? false, enableMinimal ? false,
extraConfig ? "" extraConfig ? ""
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
buildInputs = lib.optionals enableStatic [ stdenv.cc.libc stdenv.cc.libc.static ]; buildInputs = lib.optionals enableStatic [ stdenv.cc.libc stdenv.cc.libc.static ];
postPatch = "patchShebangs scripts"; postPatch = "patchShebangs .";
inherit extraConfig; inherit extraConfig;
passAsFile = [ "extraConfig" ]; passAsFile = [ "extraConfig" ];
@ -43,12 +43,15 @@ stdenv.mkDerivation rec {
make oldconfig 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... # 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 # ...this is fixed in latest git, so doCheck can likely be enabled for next release
# see https://github.com/landley/toybox/commit/b928ec480cd73fd83511c0f5ca786d1b9f3167c3 # see https://github.com/landley/toybox/commit/b928ec480cd73fd83511c0f5ca786d1b9f3167c3
#doCheck = true; #doCheck = true;
checkInputs = [ which ]; # used for tests with checkFlags = [ "DEBUG=true" ];
checkTarget = "tests"; checkTarget = "tests";
meta = with stdenv.lib; { meta = with stdenv.lib; {