Skip to content
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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

schildichat-{web,desktop}: 1.11.13-sc.1 -> 1.11.22-sc.1 #214053

Merged
merged 2 commits into from
Feb 3, 2023
Merged

schildichat-{web,desktop}: 1.11.13-sc.1 -> 1.11.22-sc.1 #214053

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c8b475c
schildichat-{web,desktop}: 1.11.13-sc.1 -> 1.11.22-sc.1
yuyuyureka Feb 1, 2023
f881d3c
schildichat-desktop: bump electron to 22.x
yuyuyureka Feb 1, 2023
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
14 changes: 7 additions & 7 deletions pkgs/applications/networking/instant-messengers/schildichat/pin.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"version": "1.11.13-sc.1",
"rev": "v1.11.13-sc.1",
"srcHash": "1yvd0mzw4qz03nf6im2msi1lp1v4ca9zknvb3ls6va11nxr01h3g",
"webYarnHash": "0bmjg9qhd89bdnh398lp257mxdgdd88wj5g3fmc3cavyd6hmgzbn",
"jsSdkYarnHash": "0j0jhbfhq0zabnc4glk2kypn53mi5s09l39i41p0zv7g1riwz7al",
"reactSdkYarnHash": "195ck2k5fhzi1b8grh5c88aiq4i3baqanjx48dam76li2msfxxfn",
"desktopYarnHash": "1scp9y2lmah3n20f1kpc9paspd3qgslg129diis7g11cz4h0wyi5"
"version": "1.11.22-sc.1",
"rev": "v1.11.22-sc.1",
"srcHash": "0di80hjd0d8bsbgbnddbmdjllc7cssgaxy27kd50j4dmw8qll1hv",
"webYarnHash": "182fh1ayh1y98kbg4mn8fxqvljs19b02j4ivvjszm55dcpwfp1df",
"jsSdkYarnHash": "0a8c7y34wh8bk1v35sa1s3s4piqkzvhjrzzapack4kzl1pfn0vix",
"reactSdkYarnHash": "0nhw9vk0yk2v738b2w6jjq5pfib5j66m5maxczhm40zync8b1wmp",
"desktopYarnHash": "0bq24rjf63rkq3jphv7raqaz2fnibmj41z905k5f3l4ln835ndfv"
}
15 changes: 8 additions & 7 deletions pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,18 @@ stdenv.mkDerivation rec {
runHook postConfigure
'';

# Only affects unused scripts in $out/share/element/electron/scripts. Also
# breaks because there are some `node`-scripts with a `npx`-shebang and
# this shouldn't be in the closure just for unused scripts.
dontPatchShebangs = true;

buildPhase = ''
runHook preBuild

pushd element-desktop
npx tsc
yarn run i18n
node ./scripts/copy-res.js
yarn --offline run build:ts
yarn --offline run i18n
yarn --offline run build:res
popd

runHook postBuild
Expand Down Expand Up @@ -97,10 +102,6 @@ stdenv.mkDerivation rec {
runHook postInstall
'';

# Do not attempt generating a tarball for element-web again.
# note: `doDist = false;` does not work.
distPhase = ";";

# The desktop item properties should be kept in sync with data from upstream:
# https://github.com/schildichat/element-desktop/blob/sc/package.json
desktopItems = [
Expand Down
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6806,7 +6806,7 @@ with pkgs;

schildichat-desktop = callPackage ../applications/networking/instant-messengers/schildichat/schildichat-desktop.nix {
inherit (darwin.apple_sdk.frameworks) Security AppKit CoreServices;
electron = electron_20;
electron = electron_22;
};
schildichat-desktop-wayland = writeScriptBin "schildichat-desktop" ''
#!/bin/sh
Expand Down