diff options
| author | happysalada <raphael@megzari.com> | 2023-11-09 17:23:45 +0100 |
|---|---|---|
| committer | Yt <happysalada@tuta.io> | 2023-11-11 12:16:04 +0000 |
| commit | c3e6ad5c94cd2093b847dc953c86e92bce4734e3 (patch) | |
| tree | c71a7ee29f0a8a10e86d4c72e99aaee1bb5270fd /pkgs/servers | |
| parent | 993c8f162dec33b826fd0eaf4f80b6284e0e5e63 (diff) | |
buildNpmPackage: replace nodejs override
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/web-apps/slskd/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/servers/web-apps/whitebophir/default.nix | 4 |
2 files changed, 6 insertions, 7 deletions
diff --git a/pkgs/servers/web-apps/slskd/default.nix b/pkgs/servers/web-apps/slskd/default.nix index bff64dd3bb0a3..c1a68f2d5e6a1 100644 --- a/pkgs/servers/web-apps/slskd/default.nix +++ b/pkgs/servers/web-apps/slskd/default.nix @@ -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 diff --git a/pkgs/servers/web-apps/whitebophir/default.nix b/pkgs/servers/web-apps/whitebophir/default.nix index 464d499cf1fb0..b3401ff78fc74 100644 --- a/pkgs/servers/web-apps/whitebophir/default.nix +++ b/pkgs/servers/web-apps/whitebophir/default.nix @@ -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 |