mirror of
https://github.com/nix-community/dream2nix.git
synced 2024-09-11 14:35:30 +03:00
nodejs builder: fix executing $buildScript
This commit is contained in:
parent
f1e34e0e89
commit
079ec025dc
@ -267,9 +267,9 @@ let
|
||||
# execute install command
|
||||
if [ -n "$buildScript" ]; then
|
||||
if [ -f "$buildScript" ]; then
|
||||
exec $buildScript
|
||||
$buildScript
|
||||
else
|
||||
echo "$buildScript" | bash
|
||||
eval "$buildScript"
|
||||
fi
|
||||
# by default, only for top level packages, `npm run build` is executed
|
||||
elif [ -n "$runBuild" ] && [ "$(jq '.scripts.build' ./package.json)" != "null" ]; then
|
||||
@ -308,12 +308,6 @@ let
|
||||
});
|
||||
in
|
||||
pkg;
|
||||
# apply packageOverrides to current derivation
|
||||
# (utils.applyOverridesToPackage {
|
||||
# inherit outputs pkg;
|
||||
# conditionalOverrides = packageOverrides;
|
||||
# pname = name;
|
||||
# });
|
||||
|
||||
in
|
||||
outputs
|
||||
|
@ -159,7 +159,7 @@ let
|
||||
if b.length applicableFuncs == 0 then
|
||||
"overrideAttrs"
|
||||
else if b.length applicableFuncs > 1 then
|
||||
throwErrorUnclearAttributeOverride Hpname condOverride._name attrName
|
||||
throwErrorUnclearAttributeOverride pname condOverride._name attrName
|
||||
else
|
||||
b.elemAt applicableFuncs 0;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user