Skip to content

Revert "nodejs_22: use shared SQLite" #366362

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
aduh95 wants to merge 1 commit into from
Closed

Revert "nodejs_22: use shared SQLite" #366362

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 4 additions & 12 deletions pkgs/development/web/nodejs/nodejs.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, openssl, python, zlib, libuv, sqlite, http-parser, icu, bash
{ lib, stdenv, fetchurl, openssl, python, zlib, libuv, http-parser, icu, bash
, ninja, pkgconf, unixtools, runCommand, buildPackages
, testers
# for `.pkgs` attribute
Expand Down Expand Up @@ -97,15 +97,8 @@ let
# TODO: also handle MIPS flags (mips_arch, mips_fpu, mips_float_abi).

useSharedHttpParser = !stdenv.hostPlatform.isDarwin && lib.versionOlder "${majorVersion}.${minorVersion}" "11.4";
useSharedSQLite = lib.versionAtLeast version "22.5";

sharedLibDeps = {
inherit openssl zlib libuv;
} // (lib.optionalAttrs useSharedHttpParser {
inherit http-parser;
}) // (lib.optionalAttrs useSharedSQLite {
inherit sqlite;
});

sharedLibDeps = { inherit openssl zlib libuv; } // (lib.optionalAttrs useSharedHttpParser { inherit http-parser; });

copyLibHeaders =
map
Expand Down Expand Up @@ -158,8 +151,7 @@ let
# wrappers over the corresponding JS scripts. There are some packages though
# that use bash wrappers, e.g. polaris-web.
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ApplicationServices ]
++ [ zlib libuv openssl http-parser icu bash ]
++ lib.optionals useSharedSQLite [ sqlite ];
++ [ zlib libuv openssl http-parser icu bash ];

nativeBuildInputs =
[
Expand Down