about summary refs log tree commit diff
path: root/pkgs/applications/networking/instant-messengers/schildichat
diff options
context:
space:
mode:
authorYureka <yuka@yuka.dev>2023-02-01 22:35:44 +0100
committerYureka <yuka@yuka.dev>2023-02-03 10:55:08 +0100
commit0dca8f64669ef2ad3db9bdee8eb03a8e57d71771 (patch)
treed56e1f2f9013a883a567d3b73ba158da07a4dfdc /pkgs/applications/networking/instant-messengers/schildichat
parent7c0fd8318e029d45b7ef2d0602cced43864f7dc2 (diff)
schildichat-{web,desktop}: 1.11.13-sc.1 -> 1.11.22-sc.1
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/schildichat')
-rw-r--r--pkgs/applications/networking/instant-messengers/schildichat/pin.json14
-rw-r--r--pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix15
2 files changed, 15 insertions, 14 deletions
diff --git a/pkgs/applications/networking/instant-messengers/schildichat/pin.json b/pkgs/applications/networking/instant-messengers/schildichat/pin.json
index 3e5af22c824a5..a0e94dc0f1d63 100644
--- a/pkgs/applications/networking/instant-messengers/schildichat/pin.json
+++ b/pkgs/applications/networking/instant-messengers/schildichat/pin.json
@@ -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"
 }
diff --git a/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix b/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix
index 0573c7231e271..cf2c44f5f2f2c 100644
--- a/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix
+++ b/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix
@@ -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
@@ -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 = [