1
1
mirror of https://github.com/NixOS/mobile-nixos.git synced 2024-12-11 09:04:01 +03:00

mruby-lvgui-native-fragment -> mruby-lvgui-native

We're replacing it with *actual bindings*, rather than FFI-based
bindings.

While currently this should be a no-op for the end-user (with the other
relevant changes in the following commits), this was made with the hopes
that it will help either entirely fix, or help track down the root cause
of an issue in a WIP feature in another branch.
This commit is contained in:
Samuel Dionne-Riel 2021-09-24 22:18:20 -04:00
parent 45709499c6
commit 2e1d77d999
6 changed files with 16318 additions and 10 deletions

View File

@ -35,14 +35,14 @@ let
mruby-zmq
# Glue that serves to link the proper dependencies into the project.
mruby-lvgui-native-fragment
mruby-lvgui-native
# Though this needs to be the real last gem, as it has
# special significance during the build.
mruby-require
];
});
mruby-lvgui-native-fragment = callPackage ./mruby-lvgui-native-fragment {
mruby-lvgui-native = callPackage ./mruby-lvgui-native {
inherit withSimulator;
};
in

View File

@ -1,4 +1,4 @@
= mruby-lvgui-native-fragment
= mruby-lvgui-native
This is glue code to build the mruby interpreter with the proper libraries.

View File

@ -9,6 +9,8 @@
, withSimulator ? false
}:
let stdenv = pkgs.stdenvAdapters.keepDebugInfo pkgs.stdenv; in
let
inherit (lib) optional optionals optionalString;
simulatorDeps = [
@ -97,12 +99,13 @@ in
pname = "lvgui";
version = "2021-07-20";
src = fetchFromGitHub {
repo = "lvgui";
owner = "mobile-nixos";
rev = "ba381a2749848ac69e08e9e59fe8a14054bcb24e";
sha256 = "0989m73kcrybgadszk1ffh4cbcfrmi0f79lbg87wrn5bxwaqbawr";
};
src = /Users/samuel/Projects/mobile-nixos/projects/lvgui;
#src = fetchFromGitHub {
# repo = "lvgui";
# owner = "mobile-nixos";
# rev = "ba381a2749848ac69e08e9e59fe8a14054bcb24e";
# sha256 = "0989m73kcrybgadszk1ffh4cbcfrmi0f79lbg87wrn5bxwaqbawr";
#};
# Document `LVGL_ENV_SIMULATOR` in the built headers.
# This allows the mrbgem to know about it.

View File

@ -1,4 +1,4 @@
MRuby::Gem::Specification.new("mruby-lvgui-native-fragment") do |spec|
MRuby::Gem::Specification.new("mruby-lvgui-native") do |spec|
spec.license = "MIT"
spec.authors = "Samuel Dionne-Riel"
spec.version = "0.0.1"
@ -7,6 +7,12 @@ MRuby::Gem::Specification.new("mruby-lvgui-native-fragment") do |spec|
spec.cc.include_paths << `pkg-config --cflags lvgui`.chomp
spec.linker.flags_after_libraries << `pkg-config --libs lvgui`.chomp
spec.cc.flags << "-Wall"
spec.cc.flags << "-Werror"
# Keep those
spec.cc.flags << "-Wno-error=cpp" # fortify with -O0
# Also declare dependencies properly here.
spec.add_dependency('mruby-fiddle')

File diff suppressed because it is too large Load Diff