diff options
| author | Nathan Zadoks <nathan@nathan7.eu> | 2016-12-03 14:57:46 -0500 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2017-01-25 00:01:52 +0200 |
| commit | bfff3d6e23c02186043b9c8ce4dc2131b803dbac (patch) | |
| tree | 918b495b8d06146b98a02c3349b72221396df89f /pkgs/os-specific/linux/busybox | |
| parent | de3cac0eceb2c746aeba20ae743c03cefca232e2 (diff) | |
| download | nixpkgs-bfff3d6e23c02186043b9c8ce4dc2131b803dbac.tar nixpkgs-bfff3d6e23c02186043b9c8ce4dc2131b803dbac.tar.gz nixpkgs-bfff3d6e23c02186043b9c8ce4dc2131b803dbac.tar.bz2 nixpkgs-bfff3d6e23c02186043b9c8ce4dc2131b803dbac.tar.lz nixpkgs-bfff3d6e23c02186043b9c8ce4dc2131b803dbac.tar.xz nixpkgs-bfff3d6e23c02186043b9c8ce4dc2131b803dbac.tar.zst nixpkgs-bfff3d6e23c02186043b9c8ce4dc2131b803dbac.zip | |
busybox: Fix in-store invocation of busybox
This fixes the usage for stdenv bootstrap. Additionally, dezgeg ported the patch from 1.25.1 to 1.26.1
Diffstat (limited to 'pkgs/os-specific/linux/busybox')
| -rw-r--r-- | pkgs/os-specific/linux/busybox/busybox-in-store.patch | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/busybox/busybox-in-store.patch b/pkgs/os-specific/linux/busybox/busybox-in-store.patch index d3111efbdc4..0de7348c44f 100644 --- a/pkgs/os-specific/linux/busybox/busybox-in-store.patch +++ b/pkgs/os-specific/linux/busybox/busybox-in-store.patch @@ -12,3 +12,12 @@ stdenv bootstrap. exit(busybox_main(argv)); # endif # if NUM_APPLETS > 0 +@@ -981,7 +981,7 @@ int main(int argc UNUSED_PARAM, char **argv) + + lbb_prepare("busybox" IF_FEATURE_INDIVIDUAL(, argv)); + # if !ENABLE_BUSYBOX +- if (argv[1] && is_prefixed_with(bb_basename(argv[0]), "busybox")) ++ if (argv[1] && strstr(bb_basename(argv[0]), "busybox") != 0) + argv++; + # endif + applet_name = argv[0]; |