b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

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

Browse source 
fluffychat: fix bug & bump version
This commit is contained in:
Maciej Krüger 2023-05-14 18:48:49 +02:00 committed by GitHub
parent ff3e89dd21 2386b444c7
commit 0881ec4731
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/applications/networking/instant-messengers/fluffychat/default.nix
View file

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

2
pkgs/applications/networking/instant-messengers/fluffychat/deps.json generated
View file

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

4
pkgs/build-support/flutter/default.nix
View file

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