From 458282be5946318086b74dfa5aedb91e6f0477aa Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Mon, 20 Aug 2018 01:51:23 +0300
Subject: [PATCH 1/2] Drop all references to --disable-init-state

It's all dead code since 2014 (commit 0c6d62cf27b3b2).
---
 configure.ac       | 6 ------
 release-common.nix | 2 +-
 release.nix        | 4 ----
 3 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6aeeacdba..cc354f6f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -229,12 +229,6 @@ if test "$gc" = yes; then
 fi
 
 
-AC_ARG_ENABLE(init-state, AC_HELP_STRING([--disable-init-state],
-  [do not initialise DB etc. in `make install']),
-  init_state=$enableval, init_state=yes)
-#AM_CONDITIONAL(INIT_STATE, test "$init_state" = "yes")
-
-
 # documentation generation switch
 AC_ARG_ENABLE(doc-gen, AC_HELP_STRING([--disable-doc-gen],
   [disable documentation generation]),
diff --git a/release-common.nix b/release-common.nix
index e23967bdb..ace2a4f9b 100644
--- a/release-common.nix
+++ b/release-common.nix
@@ -30,7 +30,7 @@ rec {
   });
 
   configureFlags =
-    [ "--disable-init-state"
+    [
       "--enable-gc"
     ] ++ lib.optionals stdenv.isLinux [
       "--with-sandbox-shell=${sh}/bin/busybox"
diff --git a/release.nix b/release.nix
index 076f1de8d..5c3fdf55c 100644
--- a/release.nix
+++ b/release.nix
@@ -189,10 +189,6 @@ let
 
         buildInputs = buildDeps;
 
-        configureFlags = ''
-          --disable-init-state
-        '';
-
         dontInstall = false;
 
         doInstallCheck = true;

From 2894197de768bf5433595886d0248e77ffa3c693 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Mon, 20 Aug 2018 02:01:59 +0300
Subject: [PATCH 2/2] Drop all references to NIX_INDENT_MAKE

Dead code since https://github.com/NixOS/nixpkgs/commit/6669a3b47711dc967df0ea8ff93fa9857aad015d
---
 release.nix                | 4 ----
 src/nix-build/nix-build.cc | 1 -
 2 files changed, 5 deletions(-)

diff --git a/release.nix b/release.nix
index 5c3fdf55c..58809ba8a 100644
--- a/release.nix
+++ b/release.nix
@@ -74,8 +74,6 @@ let
 
         makeFlags = "profiledir=$(out)/etc/profile.d";
 
-        preBuild = "unset NIX_INDENT_MAKE";
-
         installFlags = "sysconfdir=$(out)/etc";
 
         doInstallCheck = true;
@@ -103,8 +101,6 @@ let
         enableParallelBuilding = true;
 
         postUnpack = "sourceRoot=$sourceRoot/perl";
-
-        preBuild = "unset NIX_INDENT_MAKE";
       });
 
 
diff --git a/src/nix-build/nix-build.cc b/src/nix-build/nix-build.cc
index 34f1cba9d..21a0756a2 100755
--- a/src/nix-build/nix-build.cc
+++ b/src/nix-build/nix-build.cc
@@ -419,7 +419,6 @@ void mainWrapped(int argc, char * * argv)
                 R"s([ -n "$PS1" ] && PS1='\n\[\033[1;32m\][nix-shell:\w]\$\[\033[0m\] '; )s"
                 "if [ \"$(type -t runHook)\" = function ]; then runHook shellHook; fi; "
                 "unset NIX_ENFORCE_PURITY; "
-                "unset NIX_INDENT_MAKE; "
                 "shopt -u nullglob; "
                 "unset TZ; %4%"
                 "%5%",