Commit 6f0c08b

Browse files
aduh95aduh95
committed
tools: refactor shell.nix pkcs11 integration to its own section
Signed-off-by: Antoine du Hamel <duhamelantoine1995@gmail.com> PR-URL: #65404 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Filip Skokan <panva.ip@gmail.com>
1 parent 3770f9b commit 6f0c08b

1 file changed

Lines changed: 43 additions & 40 deletions

File tree

‎shell.nix‎

Lines changed: 43 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -55,16 +55,6 @@ let
5555
useSharedTemporal=builtins.hasAttr"temporal_capi"sharedLibDeps;
5656
needsRustCompiler=withTemporal&&!useSharedTemporal;
5757

58-
usePkcs11=pkcs11!=false&&pkcs11!=null;
59-
pkcs11Fixture=
60-
ifpkcs11==truethen
61-
import./tools/nix/pkcs11.nix{
62-
inheritpkgs;
63-
inherit(sharedLibDeps)openssl;
64-
}
65-
else
66-
pkcs11;
67-
6858
nativeBuildInputs=
6959
pkgs.nodejs-slim_latest.nativeBuildInputs
7060
++pkgs.lib.optionalsneedsRustCompiler[
@@ -88,35 +78,35 @@ let
8878
++pkgs.lib.optional(withTemporal&&useSharedTemporal)"--shared-temporal_capi"
8979
++pkgs.lib.optionalwithPerfetto"--with-perfetto";
9080
in
91-
pkgs.mkShell(
92-
{
93-
inheritnativeBuildInputs;
81+
pkgs.mkShell{
82+
inheritnativeBuildInputs;
9483

95-
buildInputs=
96-
builtins.attrValuessharedLibDeps
97-
++buildInputs
98-
++pkgs.lib.optional(useSeparateDerivationForV8!=false)(
99-
ifuseSeparateDerivationForV8==truethen
100-
let
101-
sharedLibsToMock=pkgs.callPackage./tools/nix/non-v8-deps-mock.nix{};
102-
in
103-
pkgs.callPackage./tools/nix/v8.nix{
104-
inheritnativeBuildInputsicu;
84+
buildInputs=
85+
builtins.attrValuessharedLibDeps
86+
++buildInputs
87+
++pkgs.lib.optional(useSeparateDerivationForV8!=false)(
88+
ifuseSeparateDerivationForV8==truethen
89+
let
90+
sharedLibsToMock=pkgs.callPackage./tools/nix/non-v8-deps-mock.nix{};
91+
in
92+
pkgs.callPackage./tools/nix/v8.nix{
93+
inheritnativeBuildInputsicu;
10594

106-
configureFlags=configureFlags++sharedLibsToMock.configureFlags++["--ninja"];
107-
buildInputs=buildInputs++[sharedLibsToMock];
108-
}
109-
else
110-
useSeparateDerivationForV8
111-
);
95+
configureFlags=configureFlags++sharedLibsToMock.configureFlags++["--ninja"];
96+
buildInputs=buildInputs++[sharedLibsToMock];
97+
}
98+
else
99+
useSeparateDerivationForV8
100+
);
112101

113-
packages=devTools++benchmarkTools++pkgs.lib.optional(ccache!=null)ccache;
102+
packages=devTools++benchmarkTools++pkgs.lib.optional(ccache!=null)ccache;
114103

115-
shellHook=pkgs.lib.optionalString(ccache!=null)''
116-
export CC="${pkgs.lib.getExeccache} $CC"
117-
export CXX="${pkgs.lib.getExeccache} $CXX"
118-
'';
104+
shellHook=pkgs.lib.optionalString(ccache!=null)''
105+
export CC="${pkgs.lib.getExeccache} $CC"
106+
export CXX="${pkgs.lib.getExeccache} $CXX"
107+
'';
119108

109+
env={
120110
BUILD_WITH=if(ninja!=null)then"ninja"else"make";
121111
NINJA=pkgs.lib.optionalString(ninja!=null)"${pkgs.lib.getExeninja}";
122112
CONFIG_FLAGS=builtins.toString(
@@ -154,9 +144,22 @@ pkgs.mkShell (
154144
//pkgs.lib.optionalAttrs(!withSQLite){
155145
NOSQLITE="1";
156146
}
157-
//pkgs.lib.optionalAttrsusePkcs11{
158-
NODE_TEST_PKCS11_OPENSSL_CONF="${pkcs11Fixture.opensslConf}";
159-
NODE_TEST_PKCS11_PIN=pkcs11Fixture.softhsmDir.pin;
160-
NODE_TEST_PKCS11_SOFTHSM_DIR="${pkcs11Fixture.softhsmDir}";
161-
}
162-
)
147+
//pkgs.lib.optionalAttrs(pkcs11!=false&&pkcs11!=null)(
148+
let
149+
pkcs11'=
150+
ifpkcs11==truethen
151+
import./tools/nix/pkcs11.nix{
152+
inheritpkgs;
153+
# Building pkcs11-provider without a shared OpenSSL is not supported.
154+
inherit(sharedLibDeps)openssl;
155+
}
156+
else
157+
pkcs11;
158+
in
159+
{
160+
NODE_TEST_PKCS11_OPENSSL_CONF=pkcs11'.opensslConf;
161+
NODE_TEST_PKCS11_PIN=pkcs11'.softhsmDir.pin;
162+
NODE_TEST_PKCS11_SOFTHSM_DIR=pkcs11'.softhsmDir;
163+
}
164+
);
165+
}

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Commit 6f0c08b
Browse files
aduh95aduh95
committed
tools: refactor shell.nix pkcs11 integration to its own section
Signed-off-by: Antoine du Hamel <duhamelantoine1995@gmail.com>
PR-URL: #65404
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Filip Skokan <panva.ip@gmail.com>
1 parent 3770f9b commit 6f0c08b
1 file changed
Lines changed: 43 additions & 40 deletions
File tree
‎shell.nix‎
Lines changed: 43 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -55,16 +55,6 @@ let
5555
useSharedTemporal=builtins.hasAttr"temporal_capi"sharedLibDeps;
5656
needsRustCompiler=withTemporal&&!useSharedTemporal;
5757

58-
usePkcs11=pkcs11!=false&&pkcs11!=null;
59-
pkcs11Fixture=
60-
ifpkcs11==truethen
61-
import./tools/nix/pkcs11.nix{
62-
inheritpkgs;
63-
inherit(sharedLibDeps)openssl;
64-
}
65-
else
66-
pkcs11;
67-
6858
nativeBuildInputs=
6959
pkgs.nodejs-slim_latest.nativeBuildInputs
7060
++pkgs.lib.optionalsneedsRustCompiler[
@@ -88,35 +78,35 @@ let
8878
++pkgs.lib.optional(withTemporal&&useSharedTemporal)"--shared-temporal_capi"
8979
++pkgs.lib.optionalwithPerfetto"--with-perfetto";
9080
in
91-
pkgs.mkShell(
92-
{
93-
inheritnativeBuildInputs;
81+
pkgs.mkShell{
82+
inheritnativeBuildInputs;
9483

95-
buildInputs=
96-
builtins.attrValuessharedLibDeps
97-
++buildInputs
98-
++pkgs.lib.optional(useSeparateDerivationForV8!=false)(
99-
ifuseSeparateDerivationForV8==truethen
100-
let
101-
sharedLibsToMock=pkgs.callPackage./tools/nix/non-v8-deps-mock.nix{};
102-
in
103-
pkgs.callPackage./tools/nix/v8.nix{
104-
inheritnativeBuildInputsicu;
84+
buildInputs=
85+
builtins.attrValuessharedLibDeps
86+
++buildInputs
87+
++pkgs.lib.optional(useSeparateDerivationForV8!=false)(
88+
ifuseSeparateDerivationForV8==truethen
89+
let
90+
sharedLibsToMock=pkgs.callPackage./tools/nix/non-v8-deps-mock.nix{};
91+
in
92+
pkgs.callPackage./tools/nix/v8.nix{
93+
inheritnativeBuildInputsicu;
10594

106-
configureFlags=configureFlags++sharedLibsToMock.configureFlags++["--ninja"];
107-
buildInputs=buildInputs++[sharedLibsToMock];
108-
}
109-
else
110-
useSeparateDerivationForV8
111-
);
95+
configureFlags=configureFlags++sharedLibsToMock.configureFlags++["--ninja"];
96+
buildInputs=buildInputs++[sharedLibsToMock];
97+
}
98+
else
99+
useSeparateDerivationForV8
100+
);
112101

113-
packages=devTools++benchmarkTools++pkgs.lib.optional(ccache!=null)ccache;
102+
packages=devTools++benchmarkTools++pkgs.lib.optional(ccache!=null)ccache;
114103

115-
shellHook=pkgs.lib.optionalString(ccache!=null)''
116-
export CC="${pkgs.lib.getExeccache} $CC"
117-
export CXX="${pkgs.lib.getExeccache} $CXX"
118-
'';
104+
shellHook=pkgs.lib.optionalString(ccache!=null)''
105+
 export CC="${pkgs.lib.getExeccache} $CC"
106+
 export CXX="${pkgs.lib.getExeccache} $CXX"
107+
 '';
119108

109+
env={
120110
BUILD_WITH=if(ninja!=null)then"ninja"else"make";
121111
NINJA=pkgs.lib.optionalString(ninja!=null)"${pkgs.lib.getExeninja}";
122112
CONFIG_FLAGS=builtins.toString(
@@ -154,9 +144,22 @@ pkgs.mkShell (
154144
//pkgs.lib.optionalAttrs(!withSQLite){
155145
NOSQLITE="1";
156146
}
157-
//pkgs.lib.optionalAttrsusePkcs11{
158-
NODE_TEST_PKCS11_OPENSSL_CONF="${pkcs11Fixture.opensslConf}";
159-
NODE_TEST_PKCS11_PIN=pkcs11Fixture.softhsmDir.pin;
160-
NODE_TEST_PKCS11_SOFTHSM_DIR="${pkcs11Fixture.softhsmDir}";
161-
}
162-
)
147+
//pkgs.lib.optionalAttrs(pkcs11!=false&&pkcs11!=null)(
148+
let
149+
pkcs11'=
150+
ifpkcs11==truethen
151+
import./tools/nix/pkcs11.nix{
152+
inheritpkgs;
153+
# Building pkcs11-provider without a shared OpenSSL is not supported.
154+
inherit(sharedLibDeps)openssl;
155+
}
156+
else
157+
pkcs11;
158+
in
159+
{
160+
NODE_TEST_PKCS11_OPENSSL_CONF=pkcs11'.opensslConf;
161+
NODE_TEST_PKCS11_PIN=pkcs11'.softhsmDir.pin;
162+
NODE_TEST_PKCS11_SOFTHSM_DIR=pkcs11'.softhsmDir;
163+
}
164+
);
165+
}
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 6f0c08b
Browse files
aduh95aduh95
committed
tools: refactor shell.nix pkcs11 integration to its own section
Signed-off-by: Antoine du Hamel <duhamelantoine1995@gmail.com>
PR-URL: #65404
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Filip Skokan <panva.ip@gmail.com>
1 parent 3770f9b commit 6f0c08b
1 file changed
Lines changed: 43 additions & 40 deletions
File tree
‎shell.nix‎
Lines changed: 43 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -55,16 +55,6 @@ let
5555
useSharedTemporal=builtins.hasAttr"temporal_capi"sharedLibDeps;
5656
needsRustCompiler=withTemporal&&!useSharedTemporal;
5757

58-
usePkcs11=pkcs11!=false&&pkcs11!=null;
59-
pkcs11Fixture=
60-
ifpkcs11==truethen
61-
import./tools/nix/pkcs11.nix{
62-
inheritpkgs;
63-
inherit(sharedLibDeps)openssl;
64-
}
65-
else
66-
pkcs11;
67-
6858
nativeBuildInputs=
6959
pkgs.nodejs-slim_latest.nativeBuildInputs
7060
++pkgs.lib.optionalsneedsRustCompiler[
@@ -88,35 +78,35 @@ let
8878
++pkgs.lib.optional(withTemporal&&useSharedTemporal)"--shared-temporal_capi"
8979
++pkgs.lib.optionalwithPerfetto"--with-perfetto";
9080
in
91-
pkgs.mkShell(
92-
{
93-
inheritnativeBuildInputs;
81+
pkgs.mkShell{
82+
inheritnativeBuildInputs;
9483

95-
buildInputs=
96-
builtins.attrValuessharedLibDeps
97-
++buildInputs
98-
++pkgs.lib.optional(useSeparateDerivationForV8!=false)(
99-
ifuseSeparateDerivationForV8==truethen
100-
let
101-
sharedLibsToMock=pkgs.callPackage./tools/nix/non-v8-deps-mock.nix{};
102-
in
103-
pkgs.callPackage./tools/nix/v8.nix{
104-
inheritnativeBuildInputsicu;
84+
buildInputs=
85+
builtins.attrValuessharedLibDeps
86+
++buildInputs
87+
++pkgs.lib.optional(useSeparateDerivationForV8!=false)(
88+
ifuseSeparateDerivationForV8==truethen
89+
let
90+
sharedLibsToMock=pkgs.callPackage./tools/nix/non-v8-deps-mock.nix{};
91+
in
92+
pkgs.callPackage./tools/nix/v8.nix{
93+
inheritnativeBuildInputsicu;
10594

106-
configureFlags=configureFlags++sharedLibsToMock.configureFlags++["--ninja"];
107-
buildInputs=buildInputs++[sharedLibsToMock];
108-
}
109-
else
110-
useSeparateDerivationForV8
111-
);
95+
configureFlags=configureFlags++sharedLibsToMock.configureFlags++["--ninja"];
96+
buildInputs=buildInputs++[sharedLibsToMock];
97+
}
98+
else
99+
useSeparateDerivationForV8
100+
);
112101

113-
packages=devTools++benchmarkTools++pkgs.lib.optional(ccache!=null)ccache;
102+
packages=devTools++benchmarkTools++pkgs.lib.optional(ccache!=null)ccache;
114103

115-
shellHook=pkgs.lib.optionalString(ccache!=null)''
116-
export CC="${pkgs.lib.getExeccache} $CC"
117-
export CXX="${pkgs.lib.getExeccache} $CXX"
118-
'';
104+
shellHook=pkgs.lib.optionalString(ccache!=null)''
105+
 export CC="${pkgs.lib.getExeccache} $CC"
106+
 export CXX="${pkgs.lib.getExeccache} $CXX"
107+
 '';
119108

109+
env={
120110
BUILD_WITH=if(ninja!=null)then"ninja"else"make";
121111
NINJA=pkgs.lib.optionalString(ninja!=null)"${pkgs.lib.getExeninja}";
122112
CONFIG_FLAGS=builtins.toString(
@@ -154,9 +144,22 @@ pkgs.mkShell (
154144
//pkgs.lib.optionalAttrs(!withSQLite){
155145
NOSQLITE="1";
156146
}
157-
//pkgs.lib.optionalAttrsusePkcs11{
158-
NODE_TEST_PKCS11_OPENSSL_CONF="${pkcs11Fixture.opensslConf}";
159-
NODE_TEST_PKCS11_PIN=pkcs11Fixture.softhsmDir.pin;
160-
NODE_TEST_PKCS11_SOFTHSM_DIR="${pkcs11Fixture.softhsmDir}";
161-
}
162-
)
147+
//pkgs.lib.optionalAttrs(pkcs11!=false&&pkcs11!=null)(
148+
let
149+
pkcs11'=
150+
ifpkcs11==truethen
151+
import./tools/nix/pkcs11.nix{
152+
inheritpkgs;
153+
# Building pkcs11-provider without a shared OpenSSL is not supported.
154+
inherit(sharedLibDeps)openssl;
155+
}
156+
else
157+
pkcs11;
158+
in
159+
{
160+
NODE_TEST_PKCS11_OPENSSL_CONF=pkcs11'.opensslConf;
161+
NODE_TEST_PKCS11_PIN=pkcs11'.softhsmDir.pin;
162+
NODE_TEST_PKCS11_SOFTHSM_DIR=pkcs11'.softhsmDir;
163+
}
164+
);
165+
}
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 6f0c08b
Browse files
aduh95aduh95
committed
tools: refactor shell.nix pkcs11 integration to its own section
Signed-off-by: Antoine du Hamel <duhamelantoine1995@gmail.com>
PR-URL: #65404
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Filip Skokan <panva.ip@gmail.com>
1 parent 3770f9b commit 6f0c08b
1 file changed
Lines changed: 43 additions & 40 deletions
File tree
‎shell.nix‎
Lines changed: 43 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -55,16 +55,6 @@ let
5555
useSharedTemporal=builtins.hasAttr"temporal_capi"sharedLibDeps;
5656
needsRustCompiler=withTemporal&&!useSharedTemporal;
5757

58-
usePkcs11=pkcs11!=false&&pkcs11!=null;
59-
pkcs11Fixture=
60-
ifpkcs11==truethen
61-
import./tools/nix/pkcs11.nix{
62-
inheritpkgs;
63-
inherit(sharedLibDeps)openssl;
64-
}
65-
else
66-
pkcs11;
67-
6858
nativeBuildInputs=
6959
pkgs.nodejs-slim_latest.nativeBuildInputs
7060
++pkgs.lib.optionalsneedsRustCompiler[
@@ -88,35 +78,35 @@ let
8878
++pkgs.lib.optional(withTemporal&&useSharedTemporal)"--shared-temporal_capi"
8979
++pkgs.lib.optionalwithPerfetto"--with-perfetto";
9080
in
91-
pkgs.mkShell(
92-
{
93-
inheritnativeBuildInputs;
81+
pkgs.mkShell{
82+
inheritnativeBuildInputs;
9483

95-
buildInputs=
96-
builtins.attrValuessharedLibDeps
97-
++buildInputs
98-
++pkgs.lib.optional(useSeparateDerivationForV8!=false)(
99-
ifuseSeparateDerivationForV8==truethen
100-
let
101-
sharedLibsToMock=pkgs.callPackage./tools/nix/non-v8-deps-mock.nix{};
102-
in
103-
pkgs.callPackage./tools/nix/v8.nix{
104-
inheritnativeBuildInputsicu;
84+
buildInputs=
85+
builtins.attrValuessharedLibDeps
86+
++buildInputs
87+
++pkgs.lib.optional(useSeparateDerivationForV8!=false)(
88+
ifuseSeparateDerivationForV8==truethen
89+
let
90+
sharedLibsToMock=pkgs.callPackage./tools/nix/non-v8-deps-mock.nix{};
91+
in
92+
pkgs.callPackage./tools/nix/v8.nix{
93+
inheritnativeBuildInputsicu;
10594

106-
configureFlags=configureFlags++sharedLibsToMock.configureFlags++["--ninja"];
107-
buildInputs=buildInputs++[sharedLibsToMock];
108-
}
109-
else
110-
useSeparateDerivationForV8
111-
);
95+
configureFlags=configureFlags++sharedLibsToMock.configureFlags++["--ninja"];
96+
buildInputs=buildInputs++[sharedLibsToMock];
97+
}
98+
else
99+
useSeparateDerivationForV8
100+
);
112101

113-
packages=devTools++benchmarkTools++pkgs.lib.optional(ccache!=null)ccache;
102+
packages=devTools++benchmarkTools++pkgs.lib.optional(ccache!=null)ccache;
114103

115-
shellHook=pkgs.lib.optionalString(ccache!=null)''
116-
export CC="${pkgs.lib.getExeccache} $CC"
117-
export CXX="${pkgs.lib.getExeccache} $CXX"
118-
'';
104+
shellHook=pkgs.lib.optionalString(ccache!=null)''
105+
 export CC="${pkgs.lib.getExeccache} $CC"
106+
 export CXX="${pkgs.lib.getExeccache} $CXX"
107+
 '';
119108

109+
env={
120110
BUILD_WITH=if(ninja!=null)then"ninja"else"make";
121111
NINJA=pkgs.lib.optionalString(ninja!=null)"${pkgs.lib.getExeninja}";
122112
CONFIG_FLAGS=builtins.toString(
@@ -154,9 +144,22 @@ pkgs.mkShell (
154144
//pkgs.lib.optionalAttrs(!withSQLite){
155145
NOSQLITE="1";
156146
}
157-
//pkgs.lib.optionalAttrsusePkcs11{
158-
NODE_TEST_PKCS11_OPENSSL_CONF="${pkcs11Fixture.opensslConf}";
159-
NODE_TEST_PKCS11_PIN=pkcs11Fixture.softhsmDir.pin;
160-
NODE_TEST_PKCS11_SOFTHSM_DIR="${pkcs11Fixture.softhsmDir}";
161-
}
162-
)
147+
//pkgs.lib.optionalAttrs(pkcs11!=false&&pkcs11!=null)(
148+
let
149+
pkcs11'=
150+
ifpkcs11==truethen
151+
import./tools/nix/pkcs11.nix{
152+
inheritpkgs;
153+
# Building pkcs11-provider without a shared OpenSSL is not supported.
154+
inherit(sharedLibDeps)openssl;
155+
}
156+
else
157+
pkcs11;
158+
in
159+
{
160+
NODE_TEST_PKCS11_OPENSSL_CONF=pkcs11'.opensslConf;
161+
NODE_TEST_PKCS11_PIN=pkcs11'.softhsmDir.pin;
162+
NODE_TEST_PKCS11_SOFTHSM_DIR=pkcs11'.softhsmDir;
163+
}
164+
);
165+
}
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Commit 6f0c08b
Browse files
aduh95aduh95
committed
tools: refactor shell.nix pkcs11 integration to its own section
Signed-off-by: Antoine du Hamel <duhamelantoine1995@gmail.com>
PR-URL: #65404
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Filip Skokan <panva.ip@gmail.com>
1 parent 3770f9b commit 6f0c08b
1 file changed
Lines changed: 43 additions & 40 deletions
File tree
‎shell.nix‎
Lines changed: 43 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -55,16 +55,6 @@ let
5555
useSharedTemporal=builtins.hasAttr"temporal_capi"sharedLibDeps;
5656
needsRustCompiler=withTemporal&&!useSharedTemporal;
5757

58-
usePkcs11=pkcs11!=false&&pkcs11!=null;
59-
pkcs11Fixture=
60-
ifpkcs11==truethen
61-
import./tools/nix/pkcs11.nix{
62-
inheritpkgs;
63-
inherit(sharedLibDeps)openssl;
64-
}
65-
else
66-
pkcs11;
67-
6858
nativeBuildInputs=
6959
pkgs.nodejs-slim_latest.nativeBuildInputs
7060
++pkgs.lib.optionalsneedsRustCompiler[
@@ -88,35 +78,35 @@ let
8878
++pkgs.lib.optional(withTemporal&&useSharedTemporal)"--shared-temporal_capi"
8979
++pkgs.lib.optionalwithPerfetto"--with-perfetto";
9080
in
91-
pkgs.mkShell(
92-
{
93-
inheritnativeBuildInputs;
81+
pkgs.mkShell{
82+
inheritnativeBuildInputs;
9483

95-
buildInputs=
96-
builtins.attrValuessharedLibDeps
97-
++buildInputs
98-
++pkgs.lib.optional(useSeparateDerivationForV8!=false)(
99-
ifuseSeparateDerivationForV8==truethen
100-
let
101-
sharedLibsToMock=pkgs.callPackage./tools/nix/non-v8-deps-mock.nix{};
102-
in
103-
pkgs.callPackage./tools/nix/v8.nix{
104-
inheritnativeBuildInputsicu;
84+
buildInputs=
85+
builtins.attrValuessharedLibDeps
86+
++buildInputs
87+
++pkgs.lib.optional(useSeparateDerivationForV8!=false)(
88+
ifuseSeparateDerivationForV8==truethen
89+
let
90+
sharedLibsToMock=pkgs.callPackage./tools/nix/non-v8-deps-mock.nix{};
91+
in
92+
pkgs.callPackage./tools/nix/v8.nix{
93+
inheritnativeBuildInputsicu;
10594

106-
configureFlags=configureFlags++sharedLibsToMock.configureFlags++["--ninja"];
107-
buildInputs=buildInputs++[sharedLibsToMock];
108-
}
109-
else
110-
useSeparateDerivationForV8
111-
);
95+
configureFlags=configureFlags++sharedLibsToMock.configureFlags++["--ninja"];
96+
buildInputs=buildInputs++[sharedLibsToMock];
97+
}
98+
else
99+
useSeparateDerivationForV8
100+
);
112101

113-
packages=devTools++benchmarkTools++pkgs.lib.optional(ccache!=null)ccache;
102+
packages=devTools++benchmarkTools++pkgs.lib.optional(ccache!=null)ccache;
114103

115-
shellHook=pkgs.lib.optionalString(ccache!=null)''
116-
export CC="${pkgs.lib.getExeccache} $CC"
117-
export CXX="${pkgs.lib.getExeccache} $CXX"
118-
'';
104+
shellHook=pkgs.lib.optionalString(ccache!=null)''
105+
 export CC="${pkgs.lib.getExeccache} $CC"
106+
 export CXX="${pkgs.lib.getExeccache} $CXX"
107+
 '';
119108

109+
env={
120110
BUILD_WITH=if(ninja!=null)then"ninja"else"make";
121111
NINJA=pkgs.lib.optionalString(ninja!=null)"${pkgs.lib.getExeninja}";
122112
CONFIG_FLAGS=builtins.toString(
@@ -154,9 +144,22 @@ pkgs.mkShell (
154144
//pkgs.lib.optionalAttrs(!withSQLite){
155145
NOSQLITE="1";
156146
}
157-
//pkgs.lib.optionalAttrsusePkcs11{
158-
NODE_TEST_PKCS11_OPENSSL_CONF="${pkcs11Fixture.opensslConf}";
159-
NODE_TEST_PKCS11_PIN=pkcs11Fixture.softhsmDir.pin;
160-
NODE_TEST_PKCS11_SOFTHSM_DIR="${pkcs11Fixture.softhsmDir}";
161-
}
162-
)
147+
//pkgs.lib.optionalAttrs(pkcs11!=false&&pkcs11!=null)(
148+
let
149+
pkcs11'=
150+
ifpkcs11==truethen
151+
import./tools/nix/pkcs11.nix{
152+
inheritpkgs;
153+
# Building pkcs11-provider without a shared OpenSSL is not supported.
154+
inherit(sharedLibDeps)openssl;
155+
}
156+
else
157+
pkcs11;
158+
in
159+
{
160+
NODE_TEST_PKCS11_OPENSSL_CONF=pkcs11'.opensslConf;
161+
NODE_TEST_PKCS11_PIN=pkcs11'.softhsmDir.pin;
162+
NODE_TEST_PKCS11_SOFTHSM_DIR=pkcs11'.softhsmDir;
163+
}
164+
);
165+
}
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 6f0c08b
Browse files
aduh95aduh95
committed
tools: refactor shell.nix pkcs11 integration to its own section
Signed-off-by: Antoine du Hamel <duhamelantoine1995@gmail.com>
PR-URL: #65404
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Filip Skokan <panva.ip@gmail.com>
1 parent 3770f9b commit 6f0c08b
1 file changed
Lines changed: 43 additions & 40 deletions
File tree
‎shell.nix‎
Lines changed: 43 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -55,16 +55,6 @@ let
5555
useSharedTemporal=builtins.hasAttr"temporal_capi"sharedLibDeps;
5656
needsRustCompiler=withTemporal&&!useSharedTemporal;
5757

58-
usePkcs11=pkcs11!=false&&pkcs11!=null;
59-
pkcs11Fixture=
60-
ifpkcs11==truethen
61-
import./tools/nix/pkcs11.nix{
62-
inheritpkgs;
63-
inherit(sharedLibDeps)openssl;
64-
}
65-
else
66-
pkcs11;
67-
6858
nativeBuildInputs=
6959
pkgs.nodejs-slim_latest.nativeBuildInputs
7060
++pkgs.lib.optionalsneedsRustCompiler[
@@ -88,35 +78,35 @@ let
8878
++pkgs.lib.optional(withTemporal&&useSharedTemporal)"--shared-temporal_capi"
8979
++pkgs.lib.optionalwithPerfetto"--with-perfetto";
9080
in
91-
pkgs.mkShell(
92-
{
93-
inheritnativeBuildInputs;
81+
pkgs.mkShell{
82+
inheritnativeBuildInputs;
9483

95-
buildInputs=
96-
builtins.attrValuessharedLibDeps
97-
++buildInputs
98-
++pkgs.lib.optional(useSeparateDerivationForV8!=false)(
99-
ifuseSeparateDerivationForV8==truethen
100-
let
101-
sharedLibsToMock=pkgs.callPackage./tools/nix/non-v8-deps-mock.nix{};
102-
in
103-
pkgs.callPackage./tools/nix/v8.nix{
104-
inheritnativeBuildInputsicu;
84+
buildInputs=
85+
builtins.attrValuessharedLibDeps
86+
++buildInputs
87+
++pkgs.lib.optional(useSeparateDerivationForV8!=false)(
88+
ifuseSeparateDerivationForV8==truethen
89+
let
90+
sharedLibsToMock=pkgs.callPackage./tools/nix/non-v8-deps-mock.nix{};
91+
in
92+
pkgs.callPackage./tools/nix/v8.nix{
93+
inheritnativeBuildInputsicu;
10594

106-
configureFlags=configureFlags++sharedLibsToMock.configureFlags++["--ninja"];
107-
buildInputs=buildInputs++[sharedLibsToMock];
108-
}
109-
else
110-
useSeparateDerivationForV8
111-
);
95+
configureFlags=configureFlags++sharedLibsToMock.configureFlags++["--ninja"];
96+
buildInputs=buildInputs++[sharedLibsToMock];
97+
}
98+
else
99+
useSeparateDerivationForV8
100+
);
112101

113-
packages=devTools++benchmarkTools++pkgs.lib.optional(ccache!=null)ccache;
102+
packages=devTools++benchmarkTools++pkgs.lib.optional(ccache!=null)ccache;
114103

115-
shellHook=pkgs.lib.optionalString(ccache!=null)''
116-
export CC="${pkgs.lib.getExeccache} $CC"
117-
export CXX="${pkgs.lib.getExeccache} $CXX"
118-
'';
104+
shellHook=pkgs.lib.optionalString(ccache!=null)''
105+
 export CC="${pkgs.lib.getExeccache} $CC"
106+
 export CXX="${pkgs.lib.getExeccache} $CXX"
107+
 '';
119108

109+
env={
120110
BUILD_WITH=if(ninja!=null)then"ninja"else"make";
121111
NINJA=pkgs.lib.optionalString(ninja!=null)"${pkgs.lib.getExeninja}";
122112
CONFIG_FLAGS=builtins.toString(
@@ -154,9 +144,22 @@ pkgs.mkShell (
154144
//pkgs.lib.optionalAttrs(!withSQLite){
155145
NOSQLITE="1";
156146
}
157-
//pkgs.lib.optionalAttrsusePkcs11{
158-
NODE_TEST_PKCS11_OPENSSL_CONF="${pkcs11Fixture.opensslConf}";
159-
NODE_TEST_PKCS11_PIN=pkcs11Fixture.softhsmDir.pin;
160-
NODE_TEST_PKCS11_SOFTHSM_DIR="${pkcs11Fixture.softhsmDir}";
161-
}
162-
)
147+
//pkgs.lib.optionalAttrs(pkcs11!=false&&pkcs11!=null)(
148+
let
149+
pkcs11'=
150+
ifpkcs11==truethen
151+
import./tools/nix/pkcs11.nix{
152+
inheritpkgs;
153+
# Building pkcs11-provider without a shared OpenSSL is not supported.
154+
inherit(sharedLibDeps)openssl;
155+
}
156+
else
157+
pkcs11;
158+
in
159+
{
160+
NODE_TEST_PKCS11_OPENSSL_CONF=pkcs11'.opensslConf;
161+
NODE_TEST_PKCS11_PIN=pkcs11'.softhsmDir.pin;
162+
NODE_TEST_PKCS11_SOFTHSM_DIR=pkcs11'.softhsmDir;
163+
}
164+
);
165+
}
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 6f0c08b
Browse files
aduh95aduh95
committed
tools: refactor shell.nix pkcs11 integration to its own section
Signed-off-by: Antoine du Hamel <duhamelantoine1995@gmail.com>
PR-URL: #65404
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Filip Skokan <panva.ip@gmail.com>
1 parent 3770f9b commit 6f0c08b
1 file changed
Lines changed: 43 additions & 40 deletions
File tree
‎shell.nix‎
Lines changed: 43 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -55,16 +55,6 @@ let
5555
useSharedTemporal=builtins.hasAttr"temporal_capi"sharedLibDeps;
5656
needsRustCompiler=withTemporal&&!useSharedTemporal;
5757

58-
usePkcs11=pkcs11!=false&&pkcs11!=null;
59-
pkcs11Fixture=
60-
ifpkcs11==truethen
61-
import./tools/nix/pkcs11.nix{
62-
inheritpkgs;
63-
inherit(sharedLibDeps)openssl;
64-
}
65-
else
66-
pkcs11;
67-
6858
nativeBuildInputs=
6959
pkgs.nodejs-slim_latest.nativeBuildInputs
7060
++pkgs.lib.optionalsneedsRustCompiler[
@@ -88,35 +78,35 @@ let
8878
++pkgs.lib.optional(withTemporal&&useSharedTemporal)"--shared-temporal_capi"
8979
++pkgs.lib.optionalwithPerfetto"--with-perfetto";
9080
in
91-
pkgs.mkShell(
92-
{
93-
inheritnativeBuildInputs;
81+
pkgs.mkShell{
82+
inheritnativeBuildInputs;
9483

95-
buildInputs=
96-
builtins.attrValuessharedLibDeps
97-
++buildInputs
98-
++pkgs.lib.optional(useSeparateDerivationForV8!=false)(
99-
ifuseSeparateDerivationForV8==truethen
100-
let
101-
sharedLibsToMock=pkgs.callPackage./tools/nix/non-v8-deps-mock.nix{};
102-
in
103-
pkgs.callPackage./tools/nix/v8.nix{
104-
inheritnativeBuildInputsicu;
84+
buildInputs=
85+
builtins.attrValuessharedLibDeps
86+
++buildInputs
87+
++pkgs.lib.optional(useSeparateDerivationForV8!=false)(
88+
ifuseSeparateDerivationForV8==truethen
89+
let
90+
sharedLibsToMock=pkgs.callPackage./tools/nix/non-v8-deps-mock.nix{};
91+
in
92+
pkgs.callPackage./tools/nix/v8.nix{
93+
inheritnativeBuildInputsicu;
10594

106-
configureFlags=configureFlags++sharedLibsToMock.configureFlags++["--ninja"];
107-
buildInputs=buildInputs++[sharedLibsToMock];
108-
}
109-
else
110-
useSeparateDerivationForV8
111-
);
95+
configureFlags=configureFlags++sharedLibsToMock.configureFlags++["--ninja"];
96+
buildInputs=buildInputs++[sharedLibsToMock];
97+
}
98+
else
99+
useSeparateDerivationForV8
100+
);
112101

113-
packages=devTools++benchmarkTools++pkgs.lib.optional(ccache!=null)ccache;
102+
packages=devTools++benchmarkTools++pkgs.lib.optional(ccache!=null)ccache;
114103

115-
shellHook=pkgs.lib.optionalString(ccache!=null)''
116-
export CC="${pkgs.lib.getExeccache} $CC"
117-
export CXX="${pkgs.lib.getExeccache} $CXX"
118-
'';
104+
shellHook=pkgs.lib.optionalString(ccache!=null)''
105+
 export CC="${pkgs.lib.getExeccache} $CC"
106+
 export CXX="${pkgs.lib.getExeccache} $CXX"
107+
 '';
119108

109+
env={
120110
BUILD_WITH=if(ninja!=null)then"ninja"else"make";
121111
NINJA=pkgs.lib.optionalString(ninja!=null)"${pkgs.lib.getExeninja}";
122112
CONFIG_FLAGS=builtins.toString(
@@ -154,9 +144,22 @@ pkgs.mkShell (
154144
//pkgs.lib.optionalAttrs(!withSQLite){
155145
NOSQLITE="1";
156146
}
157-
//pkgs.lib.optionalAttrsusePkcs11{
158-
NODE_TEST_PKCS11_OPENSSL_CONF="${pkcs11Fixture.opensslConf}";
159-
NODE_TEST_PKCS11_PIN=pkcs11Fixture.softhsmDir.pin;
160-
NODE_TEST_PKCS11_SOFTHSM_DIR="${pkcs11Fixture.softhsmDir}";
161-
}
162-
)
147+
//pkgs.lib.optionalAttrs(pkcs11!=false&&pkcs11!=null)(
148+
let
149+
pkcs11'=
150+
ifpkcs11==truethen
151+
import./tools/nix/pkcs11.nix{
152+
inheritpkgs;
153+
# Building pkcs11-provider without a shared OpenSSL is not supported.
154+
inherit(sharedLibDeps)openssl;
155+
}
156+
else
157+
pkcs11;
158+
in
159+
{
160+
NODE_TEST_PKCS11_OPENSSL_CONF=pkcs11'.opensslConf;
161+
NODE_TEST_PKCS11_PIN=pkcs11'.softhsmDir.pin;
162+
NODE_TEST_PKCS11_SOFTHSM_DIR=pkcs11'.softhsmDir;
163+
}
164+
);
165+
}
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Commit 6f0c08b
Browse files
aduh95aduh95
committed
tools: refactor shell.nix pkcs11 integration to its own section
Signed-off-by: Antoine du Hamel <duhamelantoine1995@gmail.com>
PR-URL: #65404
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Filip Skokan <panva.ip@gmail.com>
1 parent 3770f9b commit 6f0c08b
1 file changed
Lines changed: 43 additions & 40 deletions
File tree
‎shell.nix‎
Lines changed: 43 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -55,16 +55,6 @@ let
5555
useSharedTemporal=builtins.hasAttr"temporal_capi"sharedLibDeps;
5656
needsRustCompiler=withTemporal&&!useSharedTemporal;
5757

58-
usePkcs11=pkcs11!=false&&pkcs11!=null;
59-
pkcs11Fixture=
60-
ifpkcs11==truethen
61-
import./tools/nix/pkcs11.nix{
62-
inheritpkgs;
63-
inherit(sharedLibDeps)openssl;
64-
}
65-
else
66-
pkcs11;
67-
6858
nativeBuildInputs=
6959
pkgs.nodejs-slim_latest.nativeBuildInputs
7060
++pkgs.lib.optionalsneedsRustCompiler[
@@ -88,35 +78,35 @@ let
8878
++pkgs.lib.optional(withTemporal&&useSharedTemporal)"--shared-temporal_capi"
8979
++pkgs.lib.optionalwithPerfetto"--with-perfetto";
9080
in
91-
pkgs.mkShell(
92-
{
93-
inheritnativeBuildInputs;
81+
pkgs.mkShell{
82+
inheritnativeBuildInputs;
9483

95-
buildInputs=
96-
builtins.attrValuessharedLibDeps
97-
++buildInputs
98-
++pkgs.lib.optional(useSeparateDerivationForV8!=false)(
99-
ifuseSeparateDerivationForV8==truethen
100-
let
101-
sharedLibsToMock=pkgs.callPackage./tools/nix/non-v8-deps-mock.nix{};
102-
in
103-
pkgs.callPackage./tools/nix/v8.nix{
104-
inheritnativeBuildInputsicu;
84+
buildInputs=
85+
builtins.attrValuessharedLibDeps
86+
++buildInputs
87+
++pkgs.lib.optional(useSeparateDerivationForV8!=false)(
88+
ifuseSeparateDerivationForV8==truethen
89+
let
90+
sharedLibsToMock=pkgs.callPackage./tools/nix/non-v8-deps-mock.nix{};
91+
in
92+
pkgs.callPackage./tools/nix/v8.nix{
93+
inheritnativeBuildInputsicu;
10594

106-
configureFlags=configureFlags++sharedLibsToMock.configureFlags++["--ninja"];
107-
buildInputs=buildInputs++[sharedLibsToMock];
108-
}
109-
else
110-
useSeparateDerivationForV8
111-
);
95+
configureFlags=configureFlags++sharedLibsToMock.configureFlags++["--ninja"];
96+
buildInputs=buildInputs++[sharedLibsToMock];
97+
}
98+
else
99+
useSeparateDerivationForV8
100+
);
112101

113-
packages=devTools++benchmarkTools++pkgs.lib.optional(ccache!=null)ccache;
102+
packages=devTools++benchmarkTools++pkgs.lib.optional(ccache!=null)ccache;
114103

115-
shellHook=pkgs.lib.optionalString(ccache!=null)''
116-
export CC="${pkgs.lib.getExeccache} $CC"
117-
export CXX="${pkgs.lib.getExeccache} $CXX"
118-
'';
104+
shellHook=pkgs.lib.optionalString(ccache!=null)''
105+
 export CC="${pkgs.lib.getExeccache} $CC"
106+
 export CXX="${pkgs.lib.getExeccache} $CXX"
107+
 '';
119108

109+
env={
120110
BUILD_WITH=if(ninja!=null)then"ninja"else"make";
121111
NINJA=pkgs.lib.optionalString(ninja!=null)"${pkgs.lib.getExeninja}";
122112
CONFIG_FLAGS=builtins.toString(
@@ -154,9 +144,22 @@ pkgs.mkShell (
154144
//pkgs.lib.optionalAttrs(!withSQLite){
155145
NOSQLITE="1";
156146
}
157-
//pkgs.lib.optionalAttrsusePkcs11{
158-
NODE_TEST_PKCS11_OPENSSL_CONF="${pkcs11Fixture.opensslConf}";
159-
NODE_TEST_PKCS11_PIN=pkcs11Fixture.softhsmDir.pin;
160-
NODE_TEST_PKCS11_SOFTHSM_DIR="${pkcs11Fixture.softhsmDir}";
161-
}
162-
)
147+
//pkgs.lib.optionalAttrs(pkcs11!=false&&pkcs11!=null)(
148+
let
149+
pkcs11'=
150+
ifpkcs11==truethen
151+
import./tools/nix/pkcs11.nix{
152+
inheritpkgs;
153+
# Building pkcs11-provider without a shared OpenSSL is not supported.
154+
inherit(sharedLibDeps)openssl;
155+
}
156+
else
157+
pkcs11;
158+
in
159+
{
160+
NODE_TEST_PKCS11_OPENSSL_CONF=pkcs11'.opensslConf;
161+
NODE_TEST_PKCS11_PIN=pkcs11'.softhsmDir.pin;
162+
NODE_TEST_PKCS11_SOFTHSM_DIR=pkcs11'.softhsmDir;
163+
}
164+
);
165+
}
0 commit comments
Comments
 (0)