Some more improvements

nix-community · May 24, 2024 · 285d307 · 285d307
1 parent 003ba3b
commit 285d307
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 156 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -3,10 +3,11 @@
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
+    nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
     androidPkgs.url = "github:tadfisher/android-nixpkgs/stable";
   };
 
-  outputs = { self, nixpkgs, androidPkgs, ... }@inputs: let
+  outputs = { self, nixpkgs, nixpkgs-unstable, androidPkgs,  ... }@inputs: let
     pkgs = import ./pkgs/default.nix { inherit inputs; };
   in {
     # robotnixSystem evaluates a robotnix configuration

diff --git a/flavors/lineageos/test_lineageos_updater.py b/flavors/lineageos/test_lineageos_updater.py
diff --git a/modules/envpackages.nix b/modules/envpackages.nix
@@ -29,7 +29,13 @@ in
       nettools # Needed for "hostname" in build/soong/ui/build/sandbox_linux.go
       procps # Needed for "ps" in build/envsetup.sh
     ]
-    (mkIf (config.androidVersion >= 10) [
+    (mkIf (config.androidVersion >= 12) [
+      freetype # Needed by jdk9 prebuilt
+      fontconfig
+
+      python3 # glodfish doesn't need py2 anymore in Android 12+!
+    ])
+    (mkIf ((config.androidVersion >= 10) && (config.androidVersion <= 11)) [
       freetype # Needed by jdk9 prebuilt
       fontconfig
 

diff --git a/modules/release.nix b/modules/release.nix
@@ -12,7 +12,9 @@ let
     jre = if (config.androidVersion >= 11) then pkgs.jdk11_headless else pkgs.jre8_headless;
     deps = with pkgs;
       [ otaTools openssl jre zip unzip pkgs.getopt which toybox vboot_reference util-linux
-        python # ota_from_target_files invokes, brillo_update_payload which has "truncate_file" which invokes python
+        # ota_from_target_files invokes, brillo_update_payload which has "truncate_file" which invokes python
+        # c.f. https://android.googlesource.com/platform/system/update_engine/+/refs/heads/main/scripts/brillo_update_payload#338
+        python3
       ];
   in ''
     export PATH=${lib.makeBinPath deps}:$PATH

diff --git a/pkgs/default.nix b/pkgs/default.nix
@@ -3,8 +3,8 @@
 
 { inputs ? (import (
     fetchTarball {
-      url = "https://github.com/edolstra/flake-compat/archive/12c64ca55c1014cdc1b16ed5a804aa8576601ff2.tar.gz";
-      sha256 = "0jm6nzb83wa6ai17ly9fzpqc40wg1viib8klq8lby54agpl213w5"; }
+      url = "https://github.com/nix-community/flake-compat/archive/8bf105319d44f6b9f0d764efa4fdef9f1cc9ba1c.tar.gz";
+      sha256 = "sha256:0b1vcbficjcrdyqzn4pbb63xwjch1056nmjyyhk4p7kdskhl3nlj"; }
   ) {
     src =  ../.;
   }).defaultNix.inputs,
@@ -17,5 +17,5 @@ in nixpkgs.legacyPackages.x86_64-linux.appendOverlays [
     androidPkgs.packages = androidPkgs.packages.x86_64-linux;
     androidPkgs.sdk = androidPkgs.sdk.x86_64-linux;
   })
-  (import ./overlay.nix)
+  (import ./overlay.nix { inherit inputs; })
 ]
diff --git a/pkgs/overlay.nix b/pkgs/overlay.nix
@@ -1,3 +1,9 @@
+{ inputs }:
+let
+  inherit (inputs) nixpkgs-unstable;
+
+  unstablePkgs = nixpkgs-unstable.legacyPackages.x86_64-linux;
+in
 self: super: {
   android-emulator = super.callPackage ./android-emulator {};
 
@@ -33,6 +39,8 @@ self: super: {
   });
   nix-prefetch-git = super.callPackage ./fetchgit/nix-prefetch-git.nix {};
 
+  gitRepo = unstablePkgs.gitRepo;
+
   ###
 
   # Robotnix helper derivations

diff --git a/scripts/mk_repo_file.py b/scripts/mk_repo_file.py
@@ -21,6 +21,7 @@
 
 REPO_FLAGS = [
     "--quiet",
+    # Based on v2.45, matching the one overlayed in pkgs
     "--repo-url=https://github.com/jaen/tools_repo",
     "--repo-rev=dca531f6d6e9fdcf00aa9d18f0153bd66a2e32ea",
     "--no-repo-verify",