From c5c5465fe4c8007e954ae732a27ab806cca3aab6 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Tue, 3 Dec 2019 19:09:58 +0100
Subject: [PATCH] pkgs/build-support/trivial-builders: remove runCommandCCLocal
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We shouldn’t force the user to have a C compiler in scope, just
because the derivation is forced to build locally. That can’t be
counted as “lightweight” anymore.

Co-Authored-By: Silvan Mosberger<contact@infinisil.com>
---
 doc/builders/trivial-builders.xml       | 4 ++--
 pkgs/build-support/trivial-builders.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/builders/trivial-builders.xml b/doc/builders/trivial-builders.xml
index d31c74e520f..94948c57b91 100644
--- a/doc/builders/trivial-builders.xml
+++ b/doc/builders/trivial-builders.xml
@@ -52,11 +52,11 @@
   </varlistentry>
   <varlistentry xml:id="trivial-builder-runCommandLocal">
    <term>
-    <literal>runCommandLocal</literal>, <literal>runCommandCCLocal</literal>
+    <literal>runCommandLocal</literal>
    </term>
    <listitem>
     <para>
-     Variants of <literal>runCommand</literal> and <literal>runCommandCC</literal> that force the derivation to be built locally, it is not substituted. This is intended for very cheap commands (&lt;1s execution time). It saves on the network roundrip and can speed up a build.
+     Variant of <literal>runCommand</literal> that forces the derivation to be built locally, it is not substituted. This is intended for very cheap commands (&lt;1s execution time). It saves on the network roundrip and can speed up a build.
     </para>
     <note><para>
       This sets <link xlink:href="https://nixos.org/nix/manual/#adv-attr-allowSubstitutes"><literal>allowSubstitutes</literal> to <literal>false</literal></link>, so only use <literal>runCommandLocal</literal> if you are certain the user will always have a builder for the <literal>system</literal> of the derivation. This should be true for most trivial use cases (e.g. just copying some files to a different location or adding symlinks), because there the <literal>system</literal> is usually the same as <literal>builtins.currentSystem</literal>.
diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix
index 263320ca6d9..5210b7d7ba2 100644
--- a/pkgs/build-support/trivial-builders.nix
+++ b/pkgs/build-support/trivial-builders.nix
@@ -45,8 +45,8 @@ rec {
   runCommandNoCCLocal = runCommand' true stdenvNoCC;
 
   runCommandCC = runCommand' false stdenv;
-  runCommandCCLocal = runCommand' true stdenv;
-
+  # `runCommandCCLocal` left out on purpose.
+  # We shouldn’t force the user to have a cc in scope.
 
   /* Writes a text file to the nix store.
    * The contents of text is added to the file in the store.