From 984e27cd84672b1c9cbdabc3c88bea1e08acfbcf Mon Sep 17 00:00:00 2001
From: gilice <104317939+gilice@users.noreply.github.com>
Date: Sat, 8 Apr 2023 15:17:54 +0200
Subject: [PATCH 1/2] fluffychat: fix encryption

Closes #225283
---
 .../networking/instant-messengers/fluffychat/default.nix    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix
index e9b02b9cd385..28ffece57a40 100644
--- a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix
+++ b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix
@@ -8,6 +8,8 @@
 , jsoncpp
 , wrapGAppsHook
 , makeDesktopItem
+, openssl
+, olm
 }:
 
 let
@@ -36,7 +38,6 @@ stdenv.mkDerivation {
     genericName = "Chat with your friends (matrix client)";
     categories = [ "Chat" "Network" "InstantMessaging" ];
   };
-
   buildInputs = [ gtk3 libsecret jsoncpp ];
   nativeBuildInputs = [ autoPatchelfHook wrapGAppsHook imagemagick ];
 
@@ -45,7 +46,8 @@ stdenv.mkDerivation {
     mkdir -p $out/share
     mv * $out/share
 
-    ln -s $out/share/fluffychat $out/bin/fluffychat
+    makeWrapper "$out/share/fluffychat" "$out/bin/fluffychat" \
+      --prefix "LD_LIBRARY_PATH" ":" "${lib.makeLibraryPath [ openssl olm ]}"
 
     FAV=$out/share/data/flutter_assets/assets/favicon.png
     ICO=$out/share/icons

From 2741fe2ac110e33b9fd1b7713998a4dfe5dbae22 Mon Sep 17 00:00:00 2001
From: gilice <104317939+gilice@users.noreply.github.com>
Date: Sat, 8 Apr 2023 15:20:48 +0200
Subject: [PATCH 2/2] fluffychat: fix version number on package search

The version number wouldn't show up because search.nixos.org
doesn't see the inherited variable.
---
 .../networking/instant-messengers/fluffychat/default.nix     | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix
index 28ffece57a40..7064a32365e1 100644
--- a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix
+++ b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix
@@ -13,15 +13,14 @@
 }:
 
 let
-  version = "1.10.0";
   # map of nix platform -> expected url platform
   platformMap = {
     x86_64-linux = "linux-x86";
     aarch64-linux = "linux-arm64";
   };
 in
-stdenv.mkDerivation {
-  inherit version;
+stdenv.mkDerivation rec {
+  version = "1.10.0";
   name = "fluffychat";
 
   src = fetchzip {