Merge branch 'master' into mesa-updates

Change-Id: I16539f64df739453a83f8dfd962e04910a7d7ff5

1 files changed, 5 insertions, 5 deletions

diff --git a/nix/libstore/build.cc b/nix/libstore/build.cc
index 54555b92d7..461fcbc584 100644
--- a/nix/libstore/build.cc
+++ b/nix/libstore/build.cc
@@ -2155,11 +2155,11 @@ void DerivationGoal::runChild()
         int cur = personality(0xffffffff);
         if (cur != -1) personality(cur | ADDR_NO_RANDOMIZE);
 
-	/* Ask the kernel to eagerly kill us & our children if it runs out of
-	   memory, regardless of blame, to preserve ‘real’ user data & state. */
-	try {
-	    writeFile("/proc/self/oom_score_adj", "1000"); // 100%
-	} catch (...) { ignoreException(); }
+        /* Ask the kernel to eagerly kill us & our children if it runs out of
+           memory, regardless of blame, to preserve ‘real’ user data & state. */
+        try {
+            writeFile("/proc/self/oom_score_adj", "1000"); // 100%
+        } catch (...) { ignoreException(); }
 #endif
 
         /* Fill in the environment. */