mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-13 07:34:21 +00:00
Merge pull request #296971 from Rutherther/element-desktop-libnotify
element-desktop: Add libnotify to fix notifications
This commit is contained in:
commit
99e0e9ce65
@ -16,6 +16,7 @@
|
|||||||
, AppKit
|
, AppKit
|
||||||
, CoreServices
|
, CoreServices
|
||||||
, desktopToDarwinBundle
|
, desktopToDarwinBundle
|
||||||
|
, libnotify
|
||||||
, useKeytar ? true
|
, useKeytar ? true
|
||||||
}:
|
}:
|
||||||
|
|
||||||
@ -77,7 +78,13 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // {
|
|||||||
runHook postBuild
|
runHook postBuild
|
||||||
'';
|
'';
|
||||||
|
|
||||||
installPhase = ''
|
installPhase =
|
||||||
|
let
|
||||||
|
libPath = lib.makeLibraryPath [
|
||||||
|
libnotify
|
||||||
|
];
|
||||||
|
in
|
||||||
|
''
|
||||||
runHook preInstall
|
runHook preInstall
|
||||||
|
|
||||||
# resources
|
# resources
|
||||||
@ -104,6 +111,7 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // {
|
|||||||
# LD_PRELOAD workaround for sqlcipher not found: https://github.com/matrix-org/seshat/issues/102
|
# LD_PRELOAD workaround for sqlcipher not found: https://github.com/matrix-org/seshat/issues/102
|
||||||
makeWrapper '${electron}/bin/electron' "$out/bin/${executableName}" \
|
makeWrapper '${electron}/bin/electron' "$out/bin/${executableName}" \
|
||||||
--set LD_PRELOAD ${sqlcipher}/lib/libsqlcipher.so \
|
--set LD_PRELOAD ${sqlcipher}/lib/libsqlcipher.so \
|
||||||
|
--set LD_LIBRARY_PATH "${libPath}" \
|
||||||
--add-flags "$out/share/element/electron" \
|
--add-flags "$out/share/element/electron" \
|
||||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
|
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user