Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f43a553e1f72
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2c613a48ca8d
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 3, 2019

  1. 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
    @hhm0
    hhm0 committed Mar 3, 2019
    Copy the full SHA
    84f22dd View commit details

Commits on Mar 4, 2019

  1. Merge pull request #56556 from hhm0/toybox_onedir 

    toybox: install all binary links in one directory
    @infinisil
    infinisil authored Mar 4, 2019
    Copy the full SHA
    2c613a4 View commit details
Showing with 6 additions and 3 deletions.
  1. +6 −3 pkgs/tools/misc/toybox/default.nix
9 changes: 6 additions & 3 deletions pkgs/tools/misc/toybox/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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; {