diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2020-05-30 11:36:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-30 11:36:56 +0100 |
| commit | 87908c374347c2761d672bcb5f9c5258a1b48f4c (patch) | |
| tree | 7e616390d50f073e32887cc2701e391eb80fed5c /pkgs/development/tools | |
| parent | 19d44fc97dd1cd4efe57b5bb99616ed78cd20e02 (diff) | |
| parent | 6149df8fd095cb6fe5a0a4fc2438e2805942ad59 (diff) | |
| download | nixlib-87908c374347c2761d672bcb5f9c5258a1b48f4c.tar nixlib-87908c374347c2761d672bcb5f9c5258a1b48f4c.tar.gz nixlib-87908c374347c2761d672bcb5f9c5258a1b48f4c.tar.bz2 nixlib-87908c374347c2761d672bcb5f9c5258a1b48f4c.tar.lz nixlib-87908c374347c2761d672bcb5f9c5258a1b48f4c.tar.xz nixlib-87908c374347c2761d672bcb5f9c5258a1b48f4c.tar.zst nixlib-87908c374347c2761d672bcb5f9c5258a1b48f4c.zip | |
Merge pull request #89184 from mayflower/continue-pull-85764
Diffstat (limited to 'pkgs/development/tools')
| -rw-r--r-- | pkgs/development/tools/documentation/antora/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/tools/documentation/antora/default.nix b/pkgs/development/tools/documentation/antora/default.nix index 6427fa461dde..781fee2bb266 100644 --- a/pkgs/development/tools/documentation/antora/default.nix +++ b/pkgs/development/tools/documentation/antora/default.nix @@ -1,14 +1,14 @@ -{ stdenv, nodePackages_10_x }: +{ stdenv, nodePackages }: let linkNodeDeps = ({ pkg, deps, name ? "" }: let targetModule = if name != "" then name else stdenv.lib.getName pkg; - in nodePackages_10_x.${pkg}.override (oldAttrs: { + in nodePackages.${pkg}.override (oldAttrs: { postInstall = '' mkdir -p $out/lib/node_modules/${targetModule}/node_modules ${stdenv.lib.concatStringsSep "\n" (map (dep: '' - ln -s ${nodePackages_10_x.${dep}}/lib/node_modules/${stdenv.lib.getName dep} \ + ln -s ${nodePackages.${dep}}/lib/node_modules/${stdenv.lib.getName dep} \ $out/lib/node_modules/${targetModule}/node_modules/${stdenv.lib.getName dep} '') deps )} |