diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-08-23 10:09:14 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-08-26 09:07:03 +0000 |
| commit | 63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f (patch) | |
| tree | d58934cb48f9c953b19a0d0d5cffc0d0c5561471 /nixpkgs/pkgs/build-support/node | |
| parent | c4eef3dacb2a3d359561f30917d9e3cc4e041be9 (diff) | |
| parent | 91a22f76cd1716f9d0149e8a5c68424bb691de15 (diff) | |
| download | nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.gz nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.bz2 nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.lz nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.xz nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.zst nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix
Diffstat (limited to 'nixpkgs/pkgs/build-support/node')
| -rw-r--r-- | nixpkgs/pkgs/build-support/node/build-npm-package/hooks/default.nix | 5 | ||||
| -rw-r--r-- | nixpkgs/pkgs/build-support/node/build-npm-package/hooks/npm-install-hook.sh | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/nixpkgs/pkgs/build-support/node/build-npm-package/hooks/default.nix b/nixpkgs/pkgs/build-support/node/build-npm-package/hooks/default.nix index c34709335ff7..3f2b0adf1668 100644 --- a/nixpkgs/pkgs/build-support/node/build-npm-package/hooks/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/build-support/node/build-npm-package/hooks/npm-install-hook.sh b/nixpkgs/pkgs/build-support/node/build-npm-package/hooks/npm-install-hook.sh index b17fb552cc6b..64ddcbd567fc 100644 --- a/nixpkgs/pkgs/build-support/node/build-npm-package/hooks/npm-install-hook.sh +++ b/nixpkgs/pkgs/build-support/node/build-npm-package/hooks/npm-install-hook.sh @@ -24,6 +24,12 @@ npmInstallHook() { elif $typ == "object" then .bin | to_entries | map(.key + " " + .value) | join("\n") else "invalid type " + $typ | halt_error end' "${npmWorkspace-.}/package.json") + while IFS= read -r man; do + 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") + local -r nodeModulesPath="$packageOut/node_modules" if [ ! -d "$nodeModulesPath" ]; then |