From dd69797eae9e15ac27cbc9d3fe8d6b887ae85d70 Mon Sep 17 00:00:00 2001 From: gilice <104317939+gilice@users.noreply.github.com> Date: Sun, 14 May 2023 17:07:58 +0200 Subject: [PATCH 1/3] fluffychat: 1.11.0 -> 1.11.2 --- .../networking/instant-messengers/fluffychat/default.nix | 6 +++--- .../networking/instant-messengers/fluffychat/deps.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix index 1a8f2bebc29..e9f8eee8168 100644 --- a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix +++ b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix @@ -6,18 +6,18 @@ }: 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"; diff --git a/pkgs/applications/networking/instant-messengers/fluffychat/deps.json b/pkgs/applications/networking/instant-messengers/fluffychat/deps.json index 9d8e272ede6..111fc2812fa 100644 --- a/pkgs/applications/networking/instant-messengers/fluffychat/deps.json +++ b/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": [ From 8991fac3051ce05feb9137af684430470fa4f634 Mon Sep 17 00:00:00 2001 From: gilice <104317939+gilice@users.noreply.github.com> Date: Sun, 14 May 2023 17:10:49 +0200 Subject: [PATCH 2/3] flutter: build-support: allow customizing wrapProgram args --- pkgs/build-support/flutter/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/flutter/default.nix b/pkgs/build-support/flutter/default.nix index ecca6b081f2..8d31482900a 100644 --- a/pkgs/build-support/flutter/default.nix +++ b/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} From 2386b444c74738f141920eb4350a28114cb6e6eb Mon Sep 17 00:00:00 2001 From: gilice <104317939+gilice@users.noreply.github.com> Date: Sun, 14 May 2023 17:12:01 +0200 Subject: [PATCH 3/3] fluffychat: add zenity (fix #229879) --- .../networking/instant-messengers/fluffychat/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix index e9f8eee8168..2a8ebf35c87 100644 --- a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix +++ b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix @@ -3,6 +3,7 @@ , imagemagick , flutter37 , makeDesktopItem +, gnome }: flutter37.buildFlutterApplication rec { @@ -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