Merge pull request #231861 from gilice/add-zenity-to-fluffychat

fluffychat: fix bug & bump version

pkgs/applications/networking/instant-messengers/fluffychat/default.nix

@@ -3,21 +3,22 @@
 , imagemagick
 , flutter37
 , makeDesktopItem
+, gnome
 }:
 
 flutter37.buildFlutterApplication rec {
-  version = "1.11.0";
+  version = "1.11.2";
   name = "fluffychat";
 
   src = fetchFromGitLab {
     owner = "famedly";
     repo = "fluffychat";
     rev = "v${version}";
-    hash = "sha256-Z7BOGsirBVQxRJY4kmskCmPeZloc41/bf4/ExoO8VBk=";
+    hash = "sha256-vHzZDkSgxcZf3y/+A645hxBverm34J5xNnNwyxnSVUA=";
   };
 
   depsListFile = ./deps.json;
-  vendorHash = "sha256-axByNptbzGR7GQT4Gs2yaEyUCkCbI9RQNNOHN7CYd9A=";
+  vendorHash = "sha256-u8YI4UBnEfPpvjBfhbo4LGolb56w94EiUlnLlYITdXQ=";
 
   desktopItem = makeDesktopItem {
     name = "Fluffychat";
@@ -27,8 +28,9 @@ flutter37.buildFlutterApplication rec {
     genericName = "Chat with your friends (matrix client)";
     categories = [ "Chat" "Network" "InstantMessaging" ];
   };
-  nativeBuildInputs = [ imagemagick ];
 
+  nativeBuildInputs = [ imagemagick ];
+  extraWrapProgramArgs = "--prefix PATH : ${gnome.zenity}/bin";
   postInstall = ''
     FAV=$out/app/data/flutter_assets/assets/favicon.png
     ICO=$out/share/icons

pkgs/applications/networking/instant-messengers/fluffychat/deps.json

@@ -1,7 +1,7 @@
 [
   {
     "name": "fluffychat",
-    "version": "1.11.0+3254",
+    "version": "1.11.2+3360",
     "kind": "root",
     "source": "root",
     "dependencies": [

pkgs/build-support/flutter/default.nix

@@ -21,6 +21,7 @@
 , nativeBuildInputs ? [ ]
 , preUnpack ? ""
 , postFixup ? ""
+, extraWrapProgramArgs ? ""
 , ...
 }@args:
 let
@@ -121,7 +122,8 @@ let
       # which is not what application authors expect.
       for f in "$out"/bin/*; do
         wrapProgram "$f" \
-          --suffix LD_LIBRARY_PATH : '${lib.makeLibraryPath finalAttrs.runtimeDependencies}'
+          --suffix LD_LIBRARY_PATH : '${lib.makeLibraryPath finalAttrs.runtimeDependencies}' \
+          ${extraWrapProgramArgs}
       done
 
       ${postFixup}