mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-11 07:15:54 +03:00
Merge pull request #254379 from lilyinstarlight/fix/teams-for-linux-electron-hell
teams-for-linux: use electron_24 for now
This commit is contained in:
commit
14821ae8a8
@ -8,7 +8,7 @@
|
||||
, nodejs
|
||||
, fetchYarnDeps
|
||||
, fixup_yarn_lock
|
||||
, electron
|
||||
, electron_24
|
||||
, libpulseaudio
|
||||
, pipewire
|
||||
, alsa-utils
|
||||
@ -50,8 +50,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
yarn --offline electron-builder \
|
||||
--dir ${if stdenv.isDarwin then "--macos" else "--linux"} ${if stdenv.hostPlatform.isAarch64 then "--arm64" else "--x64"} \
|
||||
-c.electronDist=${electron}/libexec/electron \
|
||||
-c.electronVersion=${electron.version}
|
||||
-c.electronDist=${electron_24}/libexec/electron \
|
||||
-c.electronVersion=${electron_24.version}
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
popd
|
||||
|
||||
# Linux needs 'aplay' for notification sounds, 'libpulse' for meeting sound, and 'libpipewire' for screen sharing
|
||||
makeWrapper '${electron}/bin/electron' "$out/bin/teams-for-linux" \
|
||||
makeWrapper '${electron_24}/bin/electron' "$out/bin/teams-for-linux" \
|
||||
${lib.optionalString stdenv.isLinux ''
|
||||
--prefix PATH : ${lib.makeBinPath [ alsa-utils which ]} \
|
||||
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpulseaudio pipewire ]} \
|
||||
|
Loading…
Reference in New Issue
Block a user