Skip to content

Commit

Permalink
start incorporating fixes from yu-re-ka/robotnix
Browse files Browse the repository at this point in the history
  • Loading branch information
cassandracomar committed Apr 6, 2023
1 parent 5117f4d commit 1f5825d
Show file tree
Hide file tree
Showing 26 changed files with 668 additions and 24,603 deletions.
7 changes: 3 additions & 4 deletions apks/chromium/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,9 @@ let
ffmpeg_branding = "Chrome";

# Only include minimal symbols to save space
symbol_level = 0;
symbol_level = 1;
blink_symbol_level = 0;

use_relative_vtables_abi = false;
v8_symbol_level=0;

chrome_pgo_phase = 0;
# leaving the prebuilt clang in places forces a check on the revision that we can't satisfy
Expand Down Expand Up @@ -206,7 +205,7 @@ in stdenv.mkDerivation rec {
pname = name;
inherit version src gnSystemLibraries gnFlags;

nativeBuildInputs = [ gn ninja pkg-config jdk11 nodejs gperf bison libwebp flac libjpeg libpng libxslt libxml2 binutils autoPatchelfHook ] ++
nativeBuildInputs = [ gn ninja pkg-config jdk11 nodejs gperf bison libwebp flac libjpeg libpng libxslt libxml2 binutils ] ++
# Android stuff (from src/build/install-build-deps-android.sh)
# Including some of the stuff from src/.vpython as well
[ bsdiff
Expand Down
3 changes: 3 additions & 0 deletions apks/chromium/vanadium.nix
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,13 @@ in
proprietary_codecs = true;

is_cfi = true;
use_cfi_cast = true;
use_relative_vtables_abi = false;

enable_gvr_services = false;
enable_remoting = false;
enable_reporting = true; # 83.0.4103.83 build is broken without building this code
enable_multidex = true;
};
# Needed for patces/0082-update-dependencies.patch in earlier versions of vanadium
# -- this patch no longer exists at least as of 112.
Expand Down
58 changes: 27 additions & 31 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11";
nixpkgsUnstable.url = "github:NixOS/nixpkgs/nixos-unstable";
androidPkgs.url = "github:tadfisher/android-nixpkgs/stable";
androidPkgs.inputs.nixpkgs.follows = "nixpkgs";
};

outputs = { self, nixpkgs, androidPkgs, ... }@inputs:
Expand Down
Loading

0 comments on commit 1f5825d

Please sign in to comment.