colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

signal-desktop-from-src: fix nodejs to 18.x

Browse Source
This commit is contained in:
Colin
2023-12-11 21:05:16 +00:00
parent bfe69a4708
commit 4a622c558e
1 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/additional/signal-desktop-from-src/default.nix
View File

@@ -85,14 +85,8 @@
, autoPatchelfHook , autoPatchelfHook
, bash , bash
, buildPackages , buildPackages
# , callPackage
, cups , cups
# , electron_25
# , electron_26
# , electron
# , electron_25-bin
, electron_27-bin , electron_27-bin
# , electron-bin
, fetchurl , fetchurl
, fetchFromGitHub , fetchFromGitHub
, fetchYarnDeps , fetchYarnDeps
@@ -109,17 +103,14 @@
, libxslt , libxslt
, makeShellWrapper , makeShellWrapper
, mesa , mesa
, nodejs # version 18 , nodejs_18
# , nodejs_latest
, nspr , nspr
, nss , nss
, pango , pango
, python3 , python3
# , signal-desktop
# , sqlite # , sqlite
# , sqlcipher # , sqlcipher
, stdenv , stdenv
# , substituteAll
, wrapGAppsHook , wrapGAppsHook
, xdg-utils , xdg-utils
, yarn , yarn
@@ -159,11 +150,10 @@ let
}; };
} }
); );
nodejs' = mkNodeJs nodejs; nodejs' = mkNodeJs nodejs_18;
# TODO: possibly i could instead use nodejs-slim (npm-less nodejs) # TODO: possibly i could instead use nodejs-slim (npm-less nodejs)
buildNodejs = mkNodeJs buildPackages.nodejs; buildNodejs = mkNodeJs buildPackages.nodejs_18;
# nodejs' = nodejs_latest;
buildYarn = buildPackages.yarn.override { nodejs = buildNodejs; }; buildYarn = buildPackages.yarn.override { nodejs = buildNodejs; };
# package.json locks electron to 25.y.z # package.json locks electron to 25.y.z