From 2894197de768bf5433595886d0248e77ffa3c693 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Mon, 20 Aug 2018 02:01:59 +0300 Subject: [PATCH] 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%",