flutter: format with nixpkgs-fmt

This commit is contained in:
Thiago Kenji Okada 2021-01-06 17:38:03 -03:00
parent 877bc4b720
commit a03f012956
2 changed files with 38 additions and 9 deletions

View File

@ -1,5 +1,4 @@
{ callPackage, dart }: { callPackage, dart }:
let let
dart_stable = dart.override { version = "2.10.0"; }; dart_stable = dart.override { version = "2.10.0"; };
dart_beta = dart.override { version = "2.10.0"; }; dart_beta = dart.override { version = "2.10.0"; };
@ -8,7 +7,8 @@ let
getPatches = dir: getPatches = dir:
let files = builtins.attrNames (builtins.readDir dir); let files = builtins.attrNames (builtins.readDir dir);
in map (f: dir + ("/" + f)) files; in map (f: dir + ("/" + f)) files;
in { in
{
mkFlutter = mkFlutter; mkFlutter = mkFlutter;
stable = mkFlutter rec { stable = mkFlutter rec {
pname = "flutter"; pname = "flutter";

View File

@ -1,10 +1,37 @@
{ channel, pname, version, sha256Hash, patches, dart { channel
, filename ? "flutter_linux_${version}-${channel}.tar.xz"}: , pname
, version
{ bash, buildFHSUserEnv, cacert, coreutils, git, makeWrapper, runCommand, stdenv , sha256Hash
, fetchurl, alsaLib, dbus, expat, libpulseaudio, libuuid, libX11, libxcb , patches
, libXcomposite, libXcursor, libXdamage, libXfixes, libGL, nspr, nss, systemd }: , dart
, filename ? "flutter_linux_${version}-${channel}.tar.xz"
}:
{ bash
, buildFHSUserEnv
, cacert
, coreutils
, git
, makeWrapper
, runCommand
, stdenv
, fetchurl
, alsaLib
, dbus
, expat
, libpulseaudio
, libuuid
, libX11
, libxcb
, libXcomposite
, libXcursor
, libXdamage
, libXfixes
, libGL
, nspr
, nss
, systemd
}:
let let
drvName = "flutter-${channel}-${version}"; drvName = "flutter-${channel}-${version}";
flutter = stdenv.mkDerivation { flutter = stdenv.mkDerivation {
@ -100,7 +127,9 @@ let
]; ];
}; };
in runCommand drvName { in
runCommand drvName
{
startScript = '' startScript = ''
#!${bash}/bin/bash #!${bash}/bin/bash
export PUB_CACHE=''${PUB_CACHE:-"$HOME/.pub-cache"} export PUB_CACHE=''${PUB_CACHE:-"$HOME/.pub-cache"}