Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mobile-nixos/mobile-nixos
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 31e362563dbc
Choose a base ref
...
head repository: mobile-nixos/mobile-nixos
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f7f4920584f3
Choose a head ref
  • 3 commits
  • 2 files changed
  • 1 contributor

Commits on Mar 8, 2020

  1. initrd: Add udev rules for input devices 

    Otherwise, there is no trivial way to dinstinguish a trackpad from a
touchscreen.
    @samueldr
    samueldr committed Mar 8, 2020
    Copy the full SHA
    9ab16a6 View commit details

  2. mruby-lvgui: update lvgui (read more) 

    This adds the necessary support to better handle other pointing-type
inputs.

 * Cursor for non-touch devices
 * Handle abs min/max
 * Handle touchpads

With this, a tablet-type input, like used by QEMU, now works.
    @samueldr
    samueldr committed Mar 8, 2020
    Copy the full SHA
    022f3dc View commit details

  3. Merge pull request #88 from samueldr-wip/feature/boot-gui/inputs-fixes 

    Update lvgui for better pointer support
    @samueldr
    samueldr authored Mar 8, 2020
    Copy the full SHA
    f7f4920 View commit details
Showing with 16 additions and 4 deletions.
  1. +3 −0 modules/initrd.nix
  2. +13 −4 overlay/mruby-builder/mrbgems/mruby-lvgui/lvgui.nix
3 changes: 3 additions & 0 deletions modules/initrd.nix
View file
Original file line number Diff line number Diff line change
@@ -123,7 +123,10 @@ let
echo 'ENV{PATH}="${extraUtils}/bin"' >> $out/00-env.rules
cp -v ${udev}/lib/udev/rules.d/60-cdrom_id.rules $out/
cp -v ${udev}/lib/udev/rules.d/60-input-id.rules $out/
cp -v ${udev}/lib/udev/rules.d/60-persistent-input.rules $out/
cp -v ${udev}/lib/udev/rules.d/60-persistent-storage.rules $out/
cp -v ${udev}/lib/udev/rules.d/70-touchpad.rules $out/
cp -v ${udev}/lib/udev/rules.d/80-drivers.rules $out/
cp -v ${pkgs.lvm2}/lib/udev/rules.d/*.rules $out/
17 changes: 13 additions & 4 deletions overlay/mruby-builder/mrbgems/mruby-lvgui/lvgui.nix
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{ stdenv
, pkgs
, lib
, fetchFromGitHub
, pkg-config
, libevdev
, SDL2
, withSimulator ? false
}:
@@ -12,6 +12,15 @@ let
simulatorDeps = [
SDL2
];

# Allow libevdev to cross-compile.
libevdev = (pkgs.libevdev.override({
python3 = null;
})).overrideAttrs({nativeBuildsInputs ? [], ...}: {
nativeBuildInputs = nativeBuildsInputs ++ [
pkgs.buildPackages.python3
];
});
in
stdenv.mkDerivation {
pname = "mobile-nixos-early-boot-gui";
@@ -21,8 +30,8 @@ in
fetchSubmodules = true;
repo = "lvgui";
owner = "mobile-nixos";
rev = "27ce1511c3c30ed0921fb92504337f1917ab0943";
sha256 = "1vdahc0lymzprnlckdxcba9p78gqymvsy3bhmyqzjx68r8xcd985";
rev = "a3412d9e2a8d1c7a23b48cf2cdf2c39cf4009651";
sha256 = "1ibdjnqjacw27wmdg1fir4isffq2v87ml382f4g76ldmi5za0n9l";
};

# Document `LVGL_ENV_SIMULATOR` in the built headers.
@@ -65,7 +74,7 @@ in
Name: lvgui
Description: LVGL-based GUI library
Version: $version
Requires: ${optionalString withSimulator "sdl2"}
Requires: ${optionalString withSimulator "sdl2"} ${optionalString (!withSimulator) "libevdev"}
Cflags: -I$out/include
Libs: $out/lib/liblvgui.a