lix-project/lix
20
55
Fork 31
Code Issues 344 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Merge branch 'fix/busybox-sandbox-shell-attribute' of git://github.com/dtzWill/nix

Browse source
This commit is contained in:
Shea Levy 2018-02-06 14:01:22 -05:00
parent 43f8ef73c6 47dc6076af
commit 694b6d229b
No known key found for this signature in database
GPG key ID: 5C0BD6957D86FE27
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
release-common.nix
View file

@ -1,7 +1,9 @@
{ pkgs }:
rec {
sh = pkgs.busybox.override {
# Use "busybox-sandbox-shell" if present,
# if not (legacy) fallback and hope it's sufficient.
sh = pkgs.busybox-sandbox-shell or (pkgs.busybox.override {
useMusl = true;
enableStatic = true;
enableMinimal = true;
@ -11,7 +13,7 @@ rec {
CONFIG_ASH_TEST y
CONFIG_ASH_OPTIMIZE_FOR_SIZE y
'';
};
});
configureFlags =
[ "--disable-init-state"