Commit ade4fc2
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -6,7 +6,6 @@ | |||
| 6 | 6 | loadJSBuiltinsDynamically ? true, # Load `lib/**.js` from disk instead of embedding | |
| 7 | 7 | ninja ? pkgs.ninja, | |
| 8 | 8 | extraConfigFlags ? [ | |
| 9 | - "--without-npm" | ||
| 10 | 9 | "--debug-node" | |
| 11 | 10 | ], | |
| 12 | 11 | ||
@@ -87,13 +86,9 @@ pkgs.mkShell { | |||
| 87 | 86 | ++ pkgs.lib.optional (ninja != null) "--ninja" | |
| 88 | 87 | ++ pkgs.lib.optional loadJSBuiltinsDynamically "--node-builtin-modules-path=${builtins.toString ./.}" | |
| 89 | 88 | ++ pkgs.lib.concatMap (name: [ | |
| 90 | - "--shared-${builtins.replaceStrings [ "c-ares" ] [ "cares" ] name}" | ||
| 91 | - "--shared-${builtins.replaceStrings [ "c-ares" ] [ "cares" ] name}-libpath=${ | ||
| 92 | - pkgs.lib.getLib sharedLibDeps.${name} | ||
| 93 | - }/lib" | ||
| 94 | - "--shared-${builtins.replaceStrings [ "c-ares" ] [ "cares" ] name}-include=${ | ||
| 95 | - pkgs.lib.getInclude sharedLibDeps.${name} | ||
| 96 | - }/include" | ||
| 89 | + "--shared-${name}" | ||
| 90 | + "--shared-${name}-libpath=${pkgs.lib.getLib sharedLibDeps.${name}}/lib" | ||
| 91 | + "--shared-${name}-include=${pkgs.lib.getInclude sharedLibDeps.${name}}/include" | ||
| 97 | 92 | ]) (builtins.attrNames sharedLibDeps) | |
| 98 | 93 | ); | |
| 99 | 94 | NOSQLITE = pkgs.lib.optionalString (!withSQLite) "1"; | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -8,7 +8,6 @@ | |||
| 8 | 8 | inherit (pkgs) | |
| 9 | 9 | ada | |
| 10 | 10 | brotli | |
| 11 | - c-ares | ||
| 12 | 11 | gtest | |
| 13 | 12 | libuv | |
| 14 | 13 | nghttp2 | |
@@ -20,6 +19,7 @@ | |||
| 20 | 19 | zlib | |
| 21 | 20 | zstd | |
| 22 | 21 | ; | |
| 22 | + cares = pkgs.c-ares; | ||
| 23 | 23 | hdr-histogram = pkgs.hdrhistogram_c; | |
| 24 | 24 | http-parser = pkgs.llhttp; | |
| 25 | 25 | } | |
0 commit comments