Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit ade4fc2

Browse filesBrowse files
committed
tools: copyedit Nix files
PR-URL: #61447 Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Chengzhong Wu <legendecas@gmail.com>
1 parent df02d00 commit ade4fc2
Copy full SHA for ade4fc2

2 files changed

+4-9Lines changed: 4 additions & 9 deletions

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎shell.nix‎

Copy file name to clipboardExpand all lines: shell.nix
+3-8Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
loadJSBuiltinsDynamically ? true, # Load `lib/**.js` from disk instead of embedding
77
ninja ? pkgs.ninja,
88
extraConfigFlags ? [
9-
"--without-npm"
109
"--debug-node"
1110
],
1211

@@ -87,13 +86,9 @@ pkgs.mkShell {
8786
++ pkgs.lib.optional (ninja != null) "--ninja"
8887
++ pkgs.lib.optional loadJSBuiltinsDynamically "--node-builtin-modules-path=${builtins.toString ./.}"
8988
++ 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"
9792
]) (builtins.attrNames sharedLibDeps)
9893
);
9994
NOSQLITE = pkgs.lib.optionalString (!withSQLite) "1";
Collapse file

‎tools/nix/sharedLibDeps.nix‎

Copy file name to clipboardExpand all lines: tools/nix/sharedLibDeps.nix
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
inherit (pkgs)
99
ada
1010
brotli
11-
c-ares
1211
gtest
1312
libuv
1413
nghttp2
@@ -20,6 +19,7 @@
2019
zlib
2120
zstd
2221
;
22+
cares = pkgs.c-ares;
2323
hdr-histogram = pkgs.hdrhistogram_c;
2424
http-parser = pkgs.llhttp;
2525
}

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.