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

signal-desktop: use nixpkgs' nodejs instead of the signal pin

Browse Source 
it still seems stable
This commit is contained in:
Colin 2024-05-14 23:12:41 +00:00
parent b06b75441c
commit b534af5203
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -133,20 +133,20 @@ let
hash = "sha256-71PqRe2SuSjs/TPFUtjUBSY+huY97Djh7GPhsBk7Yws=";
};
# TODO: possibly i could instead use nodejs-slim (npm-less nodejs)
mkNodeJs = pkgs: pkgs.nodejs_20.overrideAttrs (upstream:
let
# build with the same nodejs upstream expects in package.json (it will error if the version here is incorrect)
version = "20.9.0";
hash = "sha256-oj2WgQq/BFVCazSdR85TEPMwlbe8BXG5zFEPSBw6RRk=";
in {
inherit version;
src = fetchurl {
url = "https://nodejs.org/dist/v${version}/node-v${version}.tar.xz";
inherit hash;
};
}
);
# mkNodeJs = pkgs: pkgs.nodejs;
# mkNodeJs = pkgs: pkgs.nodejs_20.overrideAttrs (upstream:
# let
# # build with the same nodejs upstream expects in package.json (it will error if the version here is incorrect)
# version = "20.9.0";
# hash = "sha256-oj2WgQq/BFVCazSdR85TEPMwlbe8BXG5zFEPSBw6RRk=";
# in {
# inherit version;
# src = fetchurl {
# url = "https://nodejs.org/dist/v${version}/node-v${version}.tar.xz";
# inherit hash;
# };
# }
# );
mkNodeJs = pkgs: pkgs.nodejs;
# signal-fts5-extension = callPackage ./fts5-extension { };
# bettersqlitePatch = substituteAll {
@ -245,7 +245,8 @@ stdenv.mkDerivation rec {
# NIX_DEBUG = 6;
postPatch = ''
# sed -i 's/"node": .*/"node": "${nodejs'.version}"/' package.json
# unpin nodejs. i should probably *try* to keep these vaguely in sync, but it seems to work decently with these out of sync too (at least, if the major versions match?)
sed -i 's/"node": .*/"node": "${nodejs'.version}"/' package.json
# fixes build failure:
# > Fusing electron at /build/source/release/linux-unpacked/signal-desktop inspect-arguments=false