diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-08-20 06:00:56 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-20 06:00:56 +0000 |
| commit | 1bb285561ee700ca05fa505a3b9782468481b1de (patch) | |
| tree | 72661aae23c4d569dae95726e4eb8e5c2b211f79 /pkgs/build-support | |
| parent | f6a4c6f91221c4925fcfd28071982e82f656693a (diff) | |
| parent | e7eb1f799cce31b7acfc694348e4daf9300acd41 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/node/build-npm-package/hooks/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/build-support/node/build-npm-package/hooks/npm-install-hook.sh | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/build-support/node/build-npm-package/hooks/default.nix b/pkgs/build-support/node/build-npm-package/hooks/default.nix index c34709335ff71..3f2b0adf1668d 100644 --- a/pkgs/build-support/node/build-npm-package/hooks/default.nix +++ b/pkgs/build-support/node/build-npm-package/hooks/default.nix @@ -27,7 +27,10 @@ npmInstallHook = makeSetupHook { name = "npm-install-hook"; - propagatedBuildInputs = [ buildPackages.makeWrapper ]; + propagatedBuildInputs = with buildPackages; [ + installShellFiles + makeWrapper + ]; substitutions = { hostNode = "${nodejs}/bin/node"; jq = "${buildPackages.jq}/bin/jq"; diff --git a/pkgs/build-support/node/build-npm-package/hooks/npm-install-hook.sh b/pkgs/build-support/node/build-npm-package/hooks/npm-install-hook.sh index efbe7fbffc198..64ddcbd567fce 100644 --- a/pkgs/build-support/node/build-npm-package/hooks/npm-install-hook.sh +++ b/pkgs/build-support/node/build-npm-package/hooks/npm-install-hook.sh @@ -25,8 +25,7 @@ npmInstallHook() { else "invalid type " + $typ | halt_error end' "${npmWorkspace-.}/package.json") while IFS= read -r man; do - mkdir -p "$out/share/man" - ln -s "$packageOut/$man" "$out/share/man" + installManPage "$packageOut/$man" done < <(@jq@ --raw-output '(.man | type) as $typ | if $typ == "string" then .man elif $typ == "list" then .man | join("\n") else "invalid type " + $typ | halt_error end' "${npmWorkspace-.}/package.json") |