chvp/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

patches: Update teams-for-linux patch

Browse source
This commit is contained in:
Charlotte Van Petegem 2023-12-18 13:21:41 +01:00
parent 906f9c91e0
commit e65c2dca0f
No known key found for this signature in database
GPG key ID: 019E764B7184435A
1 changed files with 12 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

49
patches/273932.patch
View file

@ -1,48 +1,28 @@
diff --git a/pkgs/applications/networking/instant-messengers/teams-for-linux/afterpack.patch b/pkgs/applications/networking/instant-messengers/teams-for-linux/afterpack.patch
new file mode 100644
index 00000000000000..54fe25d0816c0a
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/teams-for-linux/afterpack.patch
@@ -0,0 +1,22 @@
+diff --git a/scripts/afterpack.js b/scripts/afterpack.js
+index b277343..e6372a3 100644
+--- a/scripts/afterpack.js
++++ b/scripts/afterpack.js
+@@ -1,4 +1,5 @@
+ const {flipFuses, FuseVersion, FuseV1Options} = require('@electron/fuses');
++const {chmod} = require('fs/promises');
+
+ function getAppFileName(context) {
+ const productFileName = context.packager.appInfo.productFilename
+@@ -19,8 +20,10 @@ function getAppFileName(context) {
+
+ exports.default = async function afterPack(context) {
+ try {
++ const path = `${context.appOutDir}/${getAppFileName(context)}`;
++ await chmod(path, 0o755);
+ await flipFuses(
+- `${context.appOutDir}/${getAppFileName(context)}`,
++ path,
+ {
+ version: FuseVersion.V1,
+ [FuseV1Options.EnableCookieEncryption]: true,
diff --git a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix diff --git a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix
index ed8ed30327816a..bb2a5b868b00fd 100644 index ed8ed30327816a..d854adf654be9d 100644
--- a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix --- a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix
+++ b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix +++ b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix
@@ -19,20 +19,23 @@ @@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
+, fetchpatch
, makeWrapper
, makeDesktopItem
, copyDesktopItems
@@ -19,18 +20,18 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "teams-for-linux"; pname = "teams-for-linux";
- version = "1.3.22"; - version = "1.3.22";
+ version = "1.3.25"; + version = "1.3.26";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "IsmaelMartinez"; owner = "IsmaelMartinez";
repo = "teams-for-linux"; repo = "teams-for-linux";
rev = "v${finalAttrs.version}"; rev = "v${finalAttrs.version}";
- hash = "sha256-nyhAq06k0nNrGSbD0N1RNwcplYf5vO1BvnvEfNYGG0A="; - hash = "sha256-nyhAq06k0nNrGSbD0N1RNwcplYf5vO1BvnvEfNYGG0A=";
+ hash = "sha256-Ela2rvDuUBzgkqIEpBgVNes9BzzPhcERC1QEEs5Swis="; + hash = "sha256-wJy7jqzyuXZ2n/3DnGV8IsC0isoubMosQIKQYQ//qUg=";
}; };
offlineCache = fetchYarnDeps { offlineCache = fetchYarnDeps {
@ -51,9 +31,4 @@ index ed8ed30327816a..bb2a5b868b00fd 100644
+ hash = "sha256-EfdSwhndLtPLnDseSiRtNFYVPHZZoL+UsDA5QCitQ4o="; + hash = "sha256-EfdSwhndLtPLnDseSiRtNFYVPHZZoL+UsDA5QCitQ4o=";
}; };
+ # Upstream PR here: https://github.com/IsmaelMartinez/teams-for-linux/pull/1043
+ patches = [ ./afterpack.patch ];
+
nativeBuildInputs = [ yarn prefetch-yarn-deps nodejs copyDesktopItems makeWrapper ]; nativeBuildInputs = [ yarn prefetch-yarn-deps nodejs copyDesktopItems makeWrapper ];
configurePhase = ''