buildNpmPackage: replace nodejs override

This commit is contained in:
happysalada 2023-11-09 17:23:45 +01:00 committed by Yt
parent 993c8f162d
commit c3e6ad5c94
4 changed files with 12 additions and 13 deletions

View file

@ -1,8 +1,6 @@
{ lib, stdenv
{ lib
, buildNpmPackage
, fetchFromGitHub
, fetchurl
, unzip
, dotnetCorePackages
, buildDotnetModule
, mono
@ -27,14 +25,13 @@ let
platforms = platforms.linux;
};
buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs_18; };
wwwroot = buildNpmPackage' {
wwwroot = buildNpmPackage {
inherit meta version;
pname = "slskd-web";
src = "${src}/src/web";
npmFlags = [ "--legacy-peer-deps" ];
nodejs = nodejs_18;
npmDepsHash = "sha256-+2g3pCaGFbzQjKwhjmD6viuzVE5pRg+qSOXMrCtLQkI=";
installPhase = ''
cp -r build $out

View file

@ -7,7 +7,7 @@
let
nodejs = nodejs_20;
in buildNpmPackage.override { nodejs = nodejs_20; } rec {
in buildNpmPackage rec {
pname = "whitebophir";
version = "1.19.1";
@ -18,6 +18,8 @@ in buildNpmPackage.override { nodejs = nodejs_20; } rec {
hash = "sha256-4T7s9WrpyHVPcw0QY0C0sczDJYKzA4bAAfEv8q2pOy4=";
};
inherit nodejs;
npmDepsHash = "sha256-mKDkkX7vWrnfEg1D65bqn/MtyUS0DKjTtkDW6ebso7g=";
# geckodriver tries to access network

View file

@ -8,9 +8,7 @@
, nixosTests
}:
let
buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs_18; };
in buildNpmPackage' rec {
buildNpmPackage rec {
pname = "bitwarden-cli";
version = "2023.10.0";
@ -21,6 +19,8 @@ in buildNpmPackage' rec {
hash = "sha256-egXToXWfb9XV7JuCRBYJO4p/e+WOwMncPKz0oBgeALQ=";
};
nodejs = nodejs_18;
npmDepsHash = "sha256-iO8ZozVl1vOOqowQARnRJWSFUFnau46+dKfcMSkyU3o=";
nativeBuildInputs = [

View file

@ -24,10 +24,8 @@
let
description = "A secure and free password manager for all of your devices";
icon = "bitwarden";
buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs_18; };
electron = electron_25;
in buildNpmPackage' rec {
in buildNpmPackage rec {
pname = "bitwarden";
version = "2023.10.0";
@ -38,6 +36,8 @@ in buildNpmPackage' rec {
hash = "sha256-egXToXWfb9XV7JuCRBYJO4p/e+WOwMncPKz0oBgeALQ=";
};
nodejs = nodejs_18;
makeCacheWritable = true;
npmWorkspace = "apps/desktop";
npmDepsHash = "sha256-iO8ZozVl1vOOqowQARnRJWSFUFnau46+dKfcMSkyU3o=";