From a3d47126959fafa3902fc9411a31cb220df431ab Mon Sep 17 00:00:00 2001
From: Alexander Sosedkin <monk@unboiled.info>
Date: Sat, 5 Oct 2019 03:22:03 +0200
Subject: [PATCH] Add nixOnDroidChannelURL and nixpkgsChannelURL

Add nixOnDroidChannelURL and nixpkgsChannelURL as build parameters.
---
 src/default.nix                |  8 ++++++--
 src/pkgs/default.nix           |  4 +++-
 src/pkgs/files/default.nix     |  7 +++++--
 src/pkgs/files/login-inner.nix | 11 ++++++++---
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/src/default.nix b/src/default.nix
index e04d1a6..f446ee9 100644
--- a/src/default.nix
+++ b/src/default.nix
@@ -1,7 +1,11 @@
 # Licensed under GNU Lesser General Public License v3 or later, see COPYING.
 # Copyright (c) 2019 Alexander Sosedkin and other contributors, see AUTHORS.
 
-{ arch, initialBuild ? true }:
+{ arch
+, nixOnDroidChannelURL ? https://github.com/t184256/nix-on-droid-bootstrap/archive/testing.tar.gz
+, nixpkgsChannelURL ? https://nixos.org/channels/nixos-19.03
+, initialBuild ? true
+}:
 
 assert builtins.elem arch [ "aarch64" "i686" ];
 
@@ -15,7 +19,7 @@ let
 in
 
 import ./pkgs {
-  inherit arch initialBuild;
+  inherit arch initialBuild nixOnDroidChannelURL nixpkgsChannelURL;
   inherit (pkgsList) pinnedPkgs crossPkgs crossStaticPkgs;
   buildPkgs = if initialBuild then pkgsList.pinnedPkgs else pkgs;
 }
diff --git a/src/pkgs/default.nix b/src/pkgs/default.nix
index 497cd96..6c49327 100644
--- a/src/pkgs/default.nix
+++ b/src/pkgs/default.nix
@@ -1,7 +1,9 @@
 # Licensed under GNU Lesser General Public License v3 or later, see COPYING.
 # Copyright (c) 2019 Alexander Sosedkin and other contributors, see AUTHORS.
 
-{ arch, buildPkgs, crossPkgs, crossStaticPkgs, initialBuild, pinnedPkgs } @ args:
+{ arch, buildPkgs, crossPkgs, crossStaticPkgs, initialBuild, pinnedPkgs
+, nixOnDroidChannelURL, nixpkgsChannelURL
+} @ args:
 
 let
   callPackage = buildPkgs.lib.callPackageWith (args // pkgs);
diff --git a/src/pkgs/files/default.nix b/src/pkgs/files/default.nix
index 34f8b87..a4e8e2a 100644
--- a/src/pkgs/files/default.nix
+++ b/src/pkgs/files/default.nix
@@ -1,7 +1,7 @@
 # Licensed under GNU Lesser General Public License v3 or later, see COPYING.
 # Copyright (c) 2019 Alexander Sosedkin and other contributors, see AUTHORS.
 
-{ buildPkgs, initialBuild, nixDirectory }:
+{ buildPkgs, initialBuild, nixDirectory, nixOnDroidChannelURL, nixpkgsChannelURL }:
 
 let
   instDir = "/data/data/com.termux.nix/files/usr";
@@ -19,7 +19,10 @@ let
   };
 
   callPackage = buildPkgs.lib.callPackageWith (buildPkgs // {
-    inherit groupName initialBuild instDir packageInfo shell writeTextDir userName;
+    inherit initialBuild instDir packageInfo writeTextDir;
+    inherit groupName userName;
+    inherit shell;
+    inherit nixOnDroidChannelURL nixpkgsChannelURL;
   });
 in
 
diff --git a/src/pkgs/files/login-inner.nix b/src/pkgs/files/login-inner.nix
index f6a2f5a..b35e22f 100644
--- a/src/pkgs/files/login-inner.nix
+++ b/src/pkgs/files/login-inner.nix
@@ -1,7 +1,12 @@
 # Licensed under GNU Lesser General Public License v3 or later, see COPYING.
 # Copyright (c) 2019 Alexander Sosedkin and other contributors, see AUTHORS.
 
-{ initialBuild, instDir, packageInfo, writeTextDir }:
+{ initialBuild
+, nixpkgsChannelURL, nixOnDroidChannelURL
+, instDir
+, packageInfo
+, writeTextDir
+}:
 
 writeTextDir "usr/lib/login-inner" ''
   set -e
@@ -23,8 +28,8 @@ writeTextDir "usr/lib/login-inner" ''
       export NIX_SSL_CERT_FILE=${packageInfo.cacert}
 
       echo "Installing and updating nix-channels..."
-      ${packageInfo.nix}/bin/nix-channel --add https://nixos.org/channels/nixos-19.03 nixpkgs
-      ${packageInfo.nix}/bin/nix-channel --add https://github.com/t184256/nix-on-droid-bootstrap/archive/master.tar.gz nix-on-droid
+      ${packageInfo.nix}/bin/nix-channel --add ${nixpkgsChannelURL} nixpkgs
+      ${packageInfo.nix}/bin/nix-channel --add ${nixOnDroidChannelURL} nix-on-droid
       ${packageInfo.nix}/bin/nix-channel --update
 
       echo "Installing nix-on-droid.basic-environment..."