This repository has no description
switch builder to bash
author
Thomas Stokes
date
(Jan 15, 2025, 11:29 PM +0800)
commit
68380207
68380207700840b1b2746c9cb943ea80506d47ed
parent
d12a5b49
d12a5b494fd4c90874af628cfb7bee2d36758f99
+12
-13
+11
-13
all-packages.nix
+11
-13
all-packages.nix
···
7
7
8
8
let
9
9
mkRun =
10
-
path: args: command:
10
+
{ path, builder }:
11
+
args: command:
11
12
let
12
13
setup =
13
14
if args ? src then
···
22
23
derivation (
23
24
{
24
25
system = currentSystem;
25
-
builder = "${pkgs.busybox}/bin/ash";
26
+
inherit builder;
26
27
args = [
27
28
"-euc"
28
29
''
29
30
if [ 0 -eq "$NIX_BUILD_CORES" ]; then
30
31
NIX_BUILD_CORES=$(${pkgs.busybox}/bin/nproc)
31
32
fi
32
-
exec ${pkgs.busybox}/bin/ash -eux $commandPath
33
+
exec ${builder} -eux $commandPath
33
34
''
34
35
];
35
36
PATH = lib.makeBinPath ((args.path or [ ]) ++ path);
···
39
40
// (removeAttrs args [ "srcPath" ])
40
41
);
41
42
42
-
run0 = mkRun [ pkgs.busybox ];
43
-
44
43
wasmpkgs =
45
44
{
46
45
inherit lib inputs;
47
-
sh = run0 { name = "sh"; } ''
48
-
mkdir -p $out/bin
49
-
ln -s ${pkgs.busybox}/bin/ash $out/bin/sh
50
-
'';
51
-
run = mkRun [
52
-
pkgs.busybox
53
-
pkgs.sh
54
-
];
46
+
run = mkRun {
47
+
path = [
48
+
pkgs.busybox
49
+
pkgs.bash
50
+
];
51
+
builder = "${pkgs.bash}/bin/bash";
52
+
};
55
53
}
56
54
// lib.packagesFromDirectoryRecursive {
57
55
callPackage = lib.callPackageWith pkgs;