colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

try to get fluffychat building against nixpkgs master

Browse Source 
it fails
```
$ nix log /nix/store/2hzd4bjscfxarzdq73nhiqxmqimbwkzd-fluffychat-1.2.0.drv
...
../tmp.lqD0WQYq9a/.pub-cache/hosted/pub.dartlang.org/flutter_typeahead-3.2.4/lib/src/flutter_typeahead.dart:936:9: Error: No named parameter with the name 'maxLengthEnforced'.
```
This commit is contained in:
colin 2022-09-16 01:58:56 -07:00
parent 933996d34e
commit 58c6c1dd7d
2 changed files with 61 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
nixpatches/10-flutter-arm64.patch Normal file
View File

@ -0,0 +1,40 @@
diff --git a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix
index d50e7118cc1..cd92804b279 100644
--- a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix
+++ b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix
@@ -4,13 +4,19 @@
, olm
, imagemagick
, makeDesktopItem
+, stdenv
}:
+let vendorHashes = {
+ x86_64-linux = "sha256-co+bnsVIyg42JpM9FimfGEjrd6A99GlBeow1Dgv7NBI=";
+ aarch64-linux = "sha256-XNCtkunlWPCLTn1u7dY2Uaxf4BQ6w+nyec97iGtEvfI=";
+};
+in
flutter.mkFlutterApp rec {
pname = "fluffychat";
version = "1.2.0";
- vendorHash = "sha256-co+bnsVIyg42JpM9FimfGEjrd6A99GlBeow1Dgv7NBI=";
+ vendorHash = vendorHashes."${stdenv.hostPlatform.system}" or (throw "unsupported system: ${stdenv.hostPlatform.system}");
src = fetchFromGitLab {
owner = "famedly";
diff --git a/pkgs/development/compilers/flutter/default.nix b/pkgs/development/compilers/flutter/default.nix
index 4529d2adc1a..9a4e5ad8b38 100644
--- a/pkgs/development/compilers/flutter/default.nix
+++ b/pkgs/development/compilers/flutter/default.nix
@@ -19,6 +19,10 @@ let
url = "${dartSourceBase}/stable/release/${dartVersion}/sdk/dartsdk-linux-x64-release.zip";
sha256 = "sha256-AFJGeiPsjUZSO+DykmOIFETg2jIohg62tp3ghZrKJFk=";
};
+ "${dartVersion}-aarch64-linux" = fetchurl {
+ url = "${dartSourceBase}/stable/release/${dartVersion}/sdk/dartsdk-linux-arm64-release.zip";
+ sha256 = "sha256-BIK6kUx+m+/GfR/wBXv8rjVNbP6w1HFvH/RGIwiaJog=";
+ };
};
};
in

25
nixpatches/list.nix
View File

@ -10,14 +10,31 @@ fetchpatch: [
# (it's a dupe of https://github.com/NixOS/nixpkgs/pull/112677 )
./02-rpi4-uboot.patch
# alternative to https://github.com/NixOS/nixpkgs/pull/173200
# ./04-dart-2.7.0.patch
# TODO: more patches are required prior to this one
# flutter.dart: 2.16.1 -> 2.16.2
(fetchpatch {
url = "https://github.com/NixOS/nixpkgs/pull/172873.diff";
sha256 = "sha256-HGYk83XOhFe1wWNCKNdF6s/7laWJ0Jisb8bDJcHVlsQ=";
})
# Flutter: 2.10.1->3.0.4
(fetchpatch {
url = "https://github.com/NixOS/nixpkgs/pull/173200.diff";
sha256 = "sha256-g1tZdLTrAJx3ijgabqz8XInC20PQM3FYRENQ7c6NfQw=";
})
# dart: 2.17.3 -> 2.18.0
(fetchpatch {
url = "https://github.com/NixOS/nixpkgs/pull/189841.diff";
sha256 = "sha256-E3rTNex7PiFHsLgtb0x9/Q/naqDYD1vFuGyduV4Z6qY=";
})
# enable aarch64 support for flutter's dart package
./10-flutter-arm64.patch
# Flutter: 3.0.4->3.3.2, flutter.dart: 2.17.5->2.18.1
# (fetchpatch {
# url = "https://patch-diff.githubusercontent.com/raw/NixOS/nixpkgs/pull/173200.diff";
# sha256 = "sha256-g1tZdLTrAJx3ijgabqz8XInC20PQM3FYRENQ7c6NfQw=";
# url = "https://github.com/NixOS/nixpkgs/pull/189338.diff";
# sha256 = "sha256-MppSk1D3qQT8Z4lzEZ93UexoidT8yqM7ASPec4VvxCI=";
# })
# whalebird: support aarch64
(fetchpatch {
url = "https://github.com/NixOS/nixpkgs/pull/176476.diff";