home: support android-dev

5 files changed, 32 insertions, 9 deletions

diff --git a/config.nix b/config.nix
new file mode 100644
index 0000000..8d78534
--- /dev/null
+++ b/config.nix
@@ -0,0 +1,3 @@
+{
+  android_sdk.accept_license = true;
+}
diff --git a/flake.nix b/flake.nix
index 65941a9..bbac6ec 100644
--- a/flake.nix
+++ b/flake.nix
@@ -11,22 +11,27 @@
     nur.url = "github:nix-community/NUR";
   };
 
-  outputs = { self, nixpkgs, home-manager, nur, ... }: with nixpkgs.lib; let
+  outputs = { self, nixpkgs, home-manager, nur, ... }: let
+    pkgs = import nixpkgs {
+      system = "x86_64-linux";
+      config = import ./nixpkgs.nix;
+    };
+  in with pkgs.lib; let
     util = import ./util;
-    inherit (util nixpkgs.lib) importAll;
+    inherit (util pkgs.lib) importAll;
 
     pkgSet = pkgs: import ./pkgs {
       inherit pkgs;
       util = util pkgs.lib;
     };
   in {
-    packages."x86_64-linux" = pkgSet nixpkgs.legacyPackages."x86_64-linux";
+    packages."x86_64-linux" = pkgSet pkgs;
 
     overlay = self: super: {
       local = pkgSet super;
     };
 
-    nixosConfigurations = with nixpkgs.lib; let
+    nixosConfigurations = with pkgs.lib; let
       hostConfig = host: (makeOverridable nixosSystem) {
         system = "x86_64-linux";
         modules = [ (import ./sys self) host ];
diff --git a/home/default.nix b/home/default.nix
index 70bc03f..9a953cf 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -1,4 +1,5 @@
-{ lib, config, pkgs, nur, self, ... }: {
+{ lib, config, pkgs, nur, self, ... }:
+with lib; {
   imports = [ ./unfree.nix ];
 
   nixpkgs.overlays = [ nur.overlay self.overlay ];
@@ -39,7 +40,7 @@
       ".units_history" = devNull;
 
       ".shenvs".text = let
-        keeps = { gcKeep ? [] }: map (p: "# ${p}\n") gcKeep;
+        keeps = { gcKeep ? [] }: concatStringsSep "\n" (map toString gcKeep);
       in keeps (import ../shenvs/config.nix pkgs.local.shenvs);
     };
 
diff --git a/nixpkgs.nix b/nixpkgs.nix
new file mode 100644
index 0000000..8d78534
--- /dev/null
+++ b/nixpkgs.nix
@@ -0,0 +1,3 @@
+{
+  android_sdk.accept_license = true;
+}
diff --git a/shenvs/android-dev.nix b/shenvs/android-dev.nix
index 5bf29eb..ce85ae7 100644
--- a/shenvs/android-dev.nix
+++ b/shenvs/android-dev.nix
@@ -1,6 +1,17 @@
 pkgs: {
-  paths = with pkgs; [
-    android-tools
-    gradle
+  paths = with pkgs; let
+    android = pkgs.androidenv.composeAndroidPackages {
+	  platformVersions = [ "28" ];
+	  abiVersions = [ "armeabi-v7a" "arm64-v8a" ];
+	  extraLicenses = [];
+	};
+  in [
+    (gradleGen.override {
+      # all-packages.nix dice esto:
+      #   java = pkgs.jdk8; TODO: upgrade https://github.com/NixOS/nixpkgs/pull/89731
+      java = pkgs.jdk;
+    }).gradle_latest
+
+    android.androidsdk
   ];
 }