diff options
| author | hhm <heehooman+vcs-ci@gmail.com> | 2019-02-28 19:55:11 -0500 |
|---|---|---|
| committer | hhm <heehooman+vcs-ci@gmail.com> | 2019-03-03 16:33:24 -0500 |
| commit | 84f22dd862242118ea8e75e7dbde3b30e4dddf99 (patch) | |
| tree | d2f53d74d05a120e647a0ae1b1c0eb2cd364d968 /pkgs/tools/misc/toybox | |
| parent | 898870824d708fac857479f755ab38a657905abc (diff) | |
| download | nixpkgs-84f22dd862242118ea8e75e7dbde3b30e4dddf99.tar nixpkgs-84f22dd862242118ea8e75e7dbde3b30e4dddf99.tar.gz nixpkgs-84f22dd862242118ea8e75e7dbde3b30e4dddf99.tar.bz2 nixpkgs-84f22dd862242118ea8e75e7dbde3b30e4dddf99.tar.lz nixpkgs-84f22dd862242118ea8e75e7dbde3b30e4dddf99.tar.xz nixpkgs-84f22dd862242118ea8e75e7dbde3b30e4dddf99.tar.zst nixpkgs-84f22dd862242118ea8e75e7dbde3b30e4dddf99.zip | |
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
Diffstat (limited to 'pkgs/tools/misc/toybox')
| -rw-r--r-- | pkgs/tools/misc/toybox/default.nix | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/tools/misc/toybox/default.nix b/pkgs/tools/misc/toybox/default.nix index 5a979be249e..98fa06bccfd 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; { |