Merge branch 'wip.fluffychat.2022.09.20' into nixos-unstable
This commit is contained in:
commit
7be0a33522
2
modules/universal/env/home-packages.nix
vendored
2
modules/universal/env/home-packages.nix
vendored
|
@ -53,7 +53,7 @@ let
|
||||||
|
|
||||||
emote # TODO: package [smile](https://github.com/mijorus/smile) for probably a better mobile experience.
|
emote # TODO: package [smile](https://github.com/mijorus/smile) for probably a better mobile experience.
|
||||||
evince # works on phosh
|
evince # works on phosh
|
||||||
# fluffychat
|
fluffychat
|
||||||
foliate
|
foliate
|
||||||
font-manager
|
font-manager
|
||||||
gimp # broken on phosh
|
gimp # broken on phosh
|
||||||
|
|
|
@ -10,15 +10,15 @@ index 565c44f72e9..f20a3d4e9be 100644
|
||||||
}:
|
}:
|
||||||
|
|
||||||
+let vendorHashes = {
|
+let vendorHashes = {
|
||||||
+ x86_64-linux = "sha256-j5opwEFifa+DMG7Uziv4SWEPVokD6OSq8mSIr0AdDL0=";
|
+ x86_64-linux = "sha256-PSZK5frmQGeiTuEJNZ6Fh8NXSLIrLnoOzQk1Xa4jqHw=";
|
||||||
+ aarch64-linux = "sha256-gPz/j7oHO2f3DVNNy7DpY/8XTjWt2Kcf3XjFmH81HDs=";
|
+ aarch64-linux = "sha256-tU83EeFwakTNkEaLo90ZJV55CnmN+NcicHgBJ0u/RKM=";
|
||||||
+};
|
+};
|
||||||
+in
|
+in
|
||||||
flutter.mkFlutterApp rec {
|
flutter.mkFlutterApp rec {
|
||||||
pname = "fluffychat";
|
pname = "fluffychat";
|
||||||
version = "1.2.0";
|
version = "1.6.1";
|
||||||
|
|
||||||
- vendorHash = "sha256-j5opwEFifa+DMG7Uziv4SWEPVokD6OSq8mSIr0AdDL0=";
|
- vendorHash = "sha256-SelMRETFYZgTStV90gRoKhazu1NPbcSMO9mYebSQskQ=";
|
||||||
+ vendorHash = vendorHashes."${stdenv.hostPlatform.system}" or (throw "unsupported system: ${stdenv.hostPlatform.system}");
|
+ vendorHash = vendorHashes."${stdenv.hostPlatform.system}" or (throw "unsupported system: ${stdenv.hostPlatform.system}");
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
|
@ -33,7 +33,7 @@ index 9eba6773448..e9d352169b2 100644
|
||||||
};
|
};
|
||||||
+ "${dartVersion}-aarch64-linux" = fetchurl {
|
+ "${dartVersion}-aarch64-linux" = fetchurl {
|
||||||
+ url = "${dartSourceBase}/stable/release/${dartVersion}/sdk/dartsdk-linux-arm64-release.zip";
|
+ url = "${dartSourceBase}/stable/release/${dartVersion}/sdk/dartsdk-linux-arm64-release.zip";
|
||||||
+ sha256 = "sha256-3p0cUoNn+Du9GSvVZa9bfZ1I9295uqTA5M9kcj4/uL4=";
|
+ sha256 = "sha256-BIK6kUx+m+/GfR/wBXv8rjVNbP6w1HFvH/RGIwiaJog=";
|
||||||
+ };
|
+ };
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -4,13 +4,18 @@ fetchpatch: [
|
||||||
# (it's a dupe of https://github.com/NixOS/nixpkgs/pull/112677 )
|
# (it's a dupe of https://github.com/NixOS/nixpkgs/pull/112677 )
|
||||||
./02-rpi4-uboot.patch
|
./02-rpi4-uboot.patch
|
||||||
|
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://github.com/NixOS/nixpkgs/pull/186839.diff";
|
||||||
|
sha256 = "sha256-NdIfie+eTy4V1vgqiiRPtWdnxZ5ZHsvCMfkEDUv9SC8=";
|
||||||
|
})
|
||||||
|
|
||||||
# # # Flutter: 3.0.4->3.3.2, flutter.dart: 2.17.5->2.18.1
|
# # # Flutter: 3.0.4->3.3.2, flutter.dart: 2.17.5->2.18.1
|
||||||
# # (fetchpatch {
|
# # (fetchpatch {
|
||||||
# # url = "https://github.com/NixOS/nixpkgs/pull/189338.diff";
|
# # url = "https://github.com/NixOS/nixpkgs/pull/189338.diff";
|
||||||
# # sha256 = "sha256-MppSk1D3qQT8Z4lzEZ93UexoidT8yqM7ASPec4VvxCI=";
|
# # sha256 = "sha256-MppSk1D3qQT8Z4lzEZ93UexoidT8yqM7ASPec4VvxCI=";
|
||||||
# # })
|
# # })
|
||||||
# enable aarch64 support for flutter's dart package
|
# enable aarch64 support for flutter's dart package
|
||||||
# ./10-flutter-arm64.patch
|
./10-flutter-arm64.patch
|
||||||
|
|
||||||
|
|
||||||
# TODO: upstream
|
# TODO: upstream
|
||||||
|
|
Loading…
Reference in New Issue
Block a user