From 7908de9068c82d85529b014276d6afd4ff734632 Mon Sep 17 00:00:00 2001 From: rzuasti Date: Thu, 12 Feb 2026 10:44:58 -0500 Subject: [PATCH] Fixing --- frontend/lib/main.dart | 2 +- frontend/pubspec.lock.json | 1 + nix/package.nix | 84 +++++++++++++++++++++++++++++--------- 3 files changed, 66 insertions(+), 21 deletions(-) diff --git a/frontend/lib/main.dart b/frontend/lib/main.dart index fae0753..1ad18d9 100644 --- a/frontend/lib/main.dart +++ b/frontend/lib/main.dart @@ -17,7 +17,7 @@ class MainApp extends StatelessWidget { title: 'OOTT', theme: ThemeData( colorScheme: ColorScheme.fromSeed( - seedColor: Colors.deepOrange, + seedColor: Colors.green, brightness: Brightness.dark, ), ), diff --git a/frontend/pubspec.lock.json b/frontend/pubspec.lock.json index e69de29..163e1c7 100644 --- a/frontend/pubspec.lock.json +++ b/frontend/pubspec.lock.json @@ -0,0 +1 @@ +{"packages":{"async":{"dependency":"transitive","description":{"name":"async","sha256":"758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb","url":"https://pub.dev"},"source":"hosted","version":"2.13.0"},"boolean_selector":{"dependency":"transitive","description":{"name":"boolean_selector","sha256":"8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea","url":"https://pub.dev"},"source":"hosted","version":"2.1.2"},"characters":{"dependency":"transitive","description":{"name":"characters","sha256":"f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803","url":"https://pub.dev"},"source":"hosted","version":"1.4.0"},"clock":{"dependency":"transitive","description":{"name":"clock","sha256":"fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b","url":"https://pub.dev"},"source":"hosted","version":"1.1.2"},"collection":{"dependency":"transitive","description":{"name":"collection","sha256":"2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76","url":"https://pub.dev"},"source":"hosted","version":"1.19.1"},"fake_async":{"dependency":"transitive","description":{"name":"fake_async","sha256":"5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44","url":"https://pub.dev"},"source":"hosted","version":"1.3.3"},"flutter":{"dependency":"direct main","description":"flutter","source":"sdk","version":"0.0.0"},"flutter_lints":{"dependency":"direct dev","description":{"name":"flutter_lints","sha256":"3105dc8492f6183fb076ccf1f351ac3d60564bff92e20bfc4af9cc1651f4e7e1","url":"https://pub.dev"},"source":"hosted","version":"6.0.0"},"flutter_test":{"dependency":"direct dev","description":"flutter","source":"sdk","version":"0.0.0"},"flutter_web_plugins":{"dependency":"transitive","description":"flutter","source":"sdk","version":"0.0.0"},"go_router":{"dependency":"direct main","description":{"name":"go_router","sha256":"7974313e217a7771557add6ff2238acb63f635317c35fa590d348fb238f00896","url":"https://pub.dev"},"source":"hosted","version":"17.1.0"},"intl":{"dependency":"direct main","description":{"name":"intl","sha256":"3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5","url":"https://pub.dev"},"source":"hosted","version":"0.20.2"},"leak_tracker":{"dependency":"transitive","description":{"name":"leak_tracker","sha256":"33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de","url":"https://pub.dev"},"source":"hosted","version":"11.0.2"},"leak_tracker_flutter_testing":{"dependency":"transitive","description":{"name":"leak_tracker_flutter_testing","sha256":"1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1","url":"https://pub.dev"},"source":"hosted","version":"3.0.10"},"leak_tracker_testing":{"dependency":"transitive","description":{"name":"leak_tracker_testing","sha256":"8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1","url":"https://pub.dev"},"source":"hosted","version":"3.0.2"},"lints":{"dependency":"transitive","description":{"name":"lints","sha256":"12f842a479589fea194fe5c5a3095abc7be0c1f2ddfa9a0e76aed1dbd26a87df","url":"https://pub.dev"},"source":"hosted","version":"6.1.0"},"logging":{"dependency":"transitive","description":{"name":"logging","sha256":"c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61","url":"https://pub.dev"},"source":"hosted","version":"1.3.0"},"matcher":{"dependency":"transitive","description":{"name":"matcher","sha256":"dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2","url":"https://pub.dev"},"source":"hosted","version":"0.12.17"},"material_color_utilities":{"dependency":"transitive","description":{"name":"material_color_utilities","sha256":"f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec","url":"https://pub.dev"},"source":"hosted","version":"0.11.1"},"meta":{"dependency":"transitive","description":{"name":"meta","sha256":"23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394","url":"https://pub.dev"},"source":"hosted","version":"1.17.0"},"nested":{"dependency":"transitive","description":{"name":"nested","sha256":"03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20","url":"https://pub.dev"},"source":"hosted","version":"1.0.0"},"path":{"dependency":"transitive","description":{"name":"path","sha256":"75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5","url":"https://pub.dev"},"source":"hosted","version":"1.9.1"},"provider":{"dependency":"direct main","description":{"name":"provider","sha256":"4e82183fa20e5ca25703ead7e05de9e4cceed1fbd1eadc1ac3cb6f565a09f272","url":"https://pub.dev"},"source":"hosted","version":"6.1.5+1"},"sky_engine":{"dependency":"transitive","description":"flutter","source":"sdk","version":"0.0.0"},"source_span":{"dependency":"transitive","description":{"name":"source_span","sha256":"56a02f1f4cd1a2d96303c0144c93bd6d909eea6bee6bf5a0e0b685edbd4c47ab","url":"https://pub.dev"},"source":"hosted","version":"1.10.2"},"stack_trace":{"dependency":"transitive","description":{"name":"stack_trace","sha256":"8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1","url":"https://pub.dev"},"source":"hosted","version":"1.12.1"},"stream_channel":{"dependency":"transitive","description":{"name":"stream_channel","sha256":"969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d","url":"https://pub.dev"},"source":"hosted","version":"2.1.4"},"string_scanner":{"dependency":"transitive","description":{"name":"string_scanner","sha256":"921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43","url":"https://pub.dev"},"source":"hosted","version":"1.4.1"},"term_glyph":{"dependency":"transitive","description":{"name":"term_glyph","sha256":"7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e","url":"https://pub.dev"},"source":"hosted","version":"1.2.2"},"test_api":{"dependency":"transitive","description":{"name":"test_api","sha256":"ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55","url":"https://pub.dev"},"source":"hosted","version":"0.7.7"},"vector_math":{"dependency":"transitive","description":{"name":"vector_math","sha256":"d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b","url":"https://pub.dev"},"source":"hosted","version":"2.2.0"},"vm_service":{"dependency":"transitive","description":{"name":"vm_service","sha256":"45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60","url":"https://pub.dev"},"source":"hosted","version":"15.0.2"}},"sdks":{"dart":">=3.10.8 <4.0.0","flutter":">=3.35.0"}} diff --git a/nix/package.nix b/nix/package.nix index 3d41a45..3d18075 100644 --- a/nix/package.nix +++ b/nix/package.nix @@ -1,37 +1,81 @@ +# { +# lib, +# pkgs, +# }: let +# oott-backend = pkgs.rustPlatform.buildRustPackage rec { +# pname = "oott-backend"; +# version = "0.0.1"; +# src = ./../backend; +# cargoLock = { +# lockFile = ./../backend/Cargo.lock; +# }; +# nativeBuildInputs = [pkgs.pkg-config]; +# PKG_CONFIG_PATH = "${pkgs.openssl.dev}/lib/pkgconfig"; +# }; +# oott-frontend = pkgs.flutter.buildFlutterApplication rec { +# pname = "oott-frontend"; +# version = "0.0.1"; +# src = ./../frontend; +# pubspecLock = lib.importJSON ./../frontend/pubspec.lock.json; +# # We need to create the pubspec.lock.json file beforehand, for now we do it manually before releasing a new version by +# # cat pubspec.lock | nix run nixpkgs#yj > pubspec.lock.json +# # buildInputs = [pkgs.yj]; +# # preBuild = '' +# # cat $src/pubspec.lock | yj > $src/pubspec.lock.json +# # ''; +# }; +# in +# pkgs.stdenv.mkDerivation { +# name = "oott"; +# buildInputs = [oott-frontend oott-backend]; +# src = ./../extras; +# installPhase = '' +# mkdir -p $out/bin +# cp ${oott-backend}/bin/* $out/bin/ +# ''; +# } { lib, pkgs, }: let - oott-backend = pkgs.rustPlatform.buildRustPackage rec { - pname = "oott-backend"; - version = "0.0.1"; - src = ./../backend; - cargoLock = { - lockFile = ./../backend/Cargo.lock; - }; - - nativeBuildInputs = [pkgs.pkg-config]; - PKG_CONFIG_PATH = "${pkgs.openssl.dev}/lib/pkgconfig"; - }; - - oott-frontend = pkgs.flutter.buildFlutterApplication rec { - pname = "oott-frontend"; + oott-frontend = pkgs.stdenv.mkDerivation { + name = "oott-frontend"; version = "0.0.1"; src = ./../frontend; - pubspecLock = lib.importJSON ./../frontend/pubspec.lock.json; + doCheck = false; + dontFixup = true; - buildInputs = [pkgs.yj]; - preBuild = '' - cat $src/pubspec.lock | yj > $src/pubspec.lock.json + nativeBuildInputs = [pkgs.cacert pkgs.wget]; + + buildInputs = [pkgs.flutter]; + + buildPhase = '' + runHook preBuild + mkdir -p $out/web + # pwd + # ls -la + # HOME=$out flutter build web -o $out/web/ --verbose --disable-analytics + # ls -la $out/web + HOME=$out flutter doctor + echo "done3" + runHook postBuild ''; + + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "sha256-p/tQCa0AvRHUGYiqdsILo0AEFOvXC4ZBtp8cMDv5hI0="; + # outputHash = pkgs.lib.fakeHash; }; in pkgs.stdenv.mkDerivation { name = "oott"; - buildInputs = [oott-frontend oott-backend]; + buildInputs = [oott-frontend]; src = ./../extras; installPhase = '' mkdir -p $out/bin - cp ${oott-backend}/bin/* $out/bin/ + mkdir -p $out/web + ls -la ${oott-frontend} + ls -la ${oott-frontend}/web + cp -r ${oott-frontend}/web/* $out/web/ ''; }