Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

toybox: install all binary links in one directory #56556

Merged
merged 1 commit into from
Mar 4, 2019
Merged

toybox: install all binary links in one directory #56556

merged 1 commit into from
Mar 4, 2019
+6 −3

Conversation

hhm0
Copy link
Contributor

@hhm0 hhm0 commented Mar 1, 2019

Thanks @dtzWill!

Also removes an unused parameter.

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

Sorry, something went wrong.

@hhm0 hhm0 mentioned this pull request Mar 1, 2019
Merged
10 tasks
@GrahamcOfBorg GrahamcOfBorg added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 labels Mar 1, 2019
@infinisil
Copy link
Member

You need this to make it work correctly:

diff --git a/pkgs/tools/misc/toybox/default.nix b/pkgs/tools/misc/toybox/default.nix
index ef493de609c..fe6732fa10f 100644
--- a/pkgs/tools/misc/toybox/default.nix
+++ b/pkgs/tools/misc/toybox/default.nix
@@ -43,7 +43,7 @@ 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";

@hhm0
toybox: install all binary links in one directory
84f22dd 
also...
- removes an unused parameter
- patches all shebangs, not just those in "scripts" dir
- add "which" to checkInputs for debug mode tests
@hhm0
Copy link
Contributor Author

hhm0 commented Mar 3, 2019 •
edited
Loading

You need this to make it work correctly:

diff --git a/pkgs/tools/misc/toybox/default.nix b/pkgs/tools/misc/toybox/default.nix
index ef493de609c..fe6732fa10f 100644
--- a/pkgs/tools/misc/toybox/default.nix
+++ b/pkgs/tools/misc/toybox/default.nix
@@ -43,7 +43,7 @@ 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";

@infinisil Integrated this. Thanks for the help!

I also made a few other small fixes, as detailed in the commit message.

@infinisil infinisil merged commit 2c613a4 into NixOS:master Mar 4, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@infinisil infinisil

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@hhm0 @infinisil @GrahamcOfBorg