diff options
author | Robert Schütz <nix@dotlambda.de> | 2023-08-20 04:11:43 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-08-20 04:11:43 +0000 |
commit | cf970f13abf94efcfffb72a22a0e84e92eca5675 (patch) | |
tree | 13279bb072e19ec580efe49afd50770eb3633332 /pkgs/build-support | |
parent | 5f75be53ea1c23d764652997f39136c0281ed168 (diff) | |
parent | 96e5dce777a58991536de20a0decd504d185210d (diff) |
Merge pull request #249879 from dotlambda/carto-buildNpmPackage
carto: use buildNpmPackage
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") |