From 104b7e5e3ee4626a579c219eb119e13141a5cfe1 Mon Sep 17 00:00:00 2001
From: Tobias Happ <tobias.happ@gmx.de>
Date: Fri, 4 Oct 2019 18:01:30 +0200
Subject: [PATCH] Update basic-environment to contain all files

---
 default.nix | 74 +++++++++++++++++++----------------------------------
 1 file changed, 26 insertions(+), 48 deletions(-)

diff --git a/default.nix b/default.nix
index 81937c9..4e90fed 100644
--- a/default.nix
+++ b/default.nix
@@ -1,56 +1,34 @@
 # Licensed under GNU Lesser General Public License v3 or later, see COPYING.
 # Copyright (c) 2019 Alexander Sosedkin and other contributors, see AUTHORS.
 
-{ pkgs ? import <nixpkgs> { } }:
+let
+  nixpkgs = import <nixpkgs> { };
 
-rec {
-  basic-environment = pkgs.buildEnv {
+  pkgs = import ./src {
+    arch = if nixpkgs.stdenv.hostPlatform.isArm then "aarch64" else "i686";
+    initialBuild = false;
+  };
+in
+
+{
+  inherit (pkgs) proot;
+
+  basic-environment = nixpkgs.buildEnv {
     name = "basic-environment";
 
-    paths = with pkgs; [
-      bashInteractive
-      cacert
-      coreutils
-      hm-install
-      nix
-      nix-on-droid-linker
+    paths = [
+      nixpkgs.bashInteractive
+      nixpkgs.cacert
+      nixpkgs.coreutils
+      nixpkgs.nix
+      # pkgs.proot
+      pkgs.files.hmInstall
+      pkgs.files.homeNixDefault
+      pkgs.files.login
+      pkgs.files.loginInner
+      pkgs.files.nixConf
+      pkgs.files.nixOnDroidLinker
+      pkgs.files.resolvConf
     ];
   };
-
-  hm-install = pkgs.writeScriptBin "hm-install" ''
-    #!/usr/bin/env sh
-    set -e
-
-    if [ -e $HOME/.nix-profile/etc/profile.d/hm-session-vars.sh ]; then
-      echo "You already have home-manager installed."
-    fi
-
-    echo "Subscribing to home-manager channel..."
-    ${pkgs.nix}/bin/nix-channel --add https://github.com/rycee/home-manager/archive/master.tar.gz home-manager
-    echo "Updating channels..."
-    ${pkgs.nix}/bin/nix-channel --update
-
-    export NIX_PATH=$HOME/.nix-defexpr/channels''${NIX_PATH:+:}$NIX_PATH
-
-    if [ ! -e $HOME/.config/nixpkgs/home.nix ]; then
-      echo "Creating an initial home-manager configuration in ~/.config/nixpkgs/home.nix ..."
-      ${pkgs.coreutils}/bin/mkdir -p $HOME/.config/nixpkgs
-      ${pkgs.coreutils}/bin/cp -n /etc/home.nix.default $HOME/.config/nixpkgs/home.nix
-    fi
-
-    echo "Uninstalling basic-environment..."
-    ${pkgs.nix}/bin/nix-env --uninstall basic-environment
-    echo "Installing home-manager..."
-    ${pkgs.nix}/bin/nix run nixpkgs.nix -c ${pkgs.nix}/bin/nix-shell '<home-manager>' -A install
-  '';
-
-  nix-on-droid-linker = pkgs.writeScriptBin "nix-on-droid-linker" ''
-    #!/usr/bin/env sh
-    set -e
-
-    echo "Linking ~/.nix-profile/bin/sh to /bin/sh"
-    ${pkgs.coreutils}/bin/ln -snf $HOME/.nix-profile/bin/sh /bin/sh
-    echo "Linking ~/.nix-profile/usr/bin/env to /usr/bin/env"
-    ${pkgs.coreutils}/bin/ln -snf $HOME/.nix-profile/bin/env /usr/bin/env
-  '';
-}
+} // pkgs.files