From 287fce6402100c40317233de6b4f749f2b79b0a5 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 23 Aug 2017 16:23:30 -0400
Subject: [PATCH] expand-response-params: Pull out of cc-wrapper

No hashes were changed
---
 pkgs/build-support/cc-wrapper/default.nix        | 16 ++++------------
 .../expand-response-params/default.nix           | 13 +++++++++++++
 .../expand-response-params.c                     |  0
 3 files changed, 17 insertions(+), 12 deletions(-)
 create mode 100644 pkgs/build-support/expand-response-params/default.nix
 rename pkgs/build-support/{cc-wrapper => expand-response-params}/expand-response-params.c (100%)

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index 525cb07ac32..d5ae64c9c5f 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -74,18 +74,10 @@ let
     else if stdenv.lib.hasSuffix "pc-gnu" targetPlatform.config then "ld.so.1"
     else null;
 
-  expand-response-params = if buildPackages.stdenv.cc or null != null && buildPackages.stdenv.cc != "/dev/null"
-  then buildPackages.stdenv.mkDerivation {
-    name = "expand-response-params";
-    src = ./expand-response-params.c;
-    buildCommand = ''
-      # Work around "stdenv-darwin-boot-2 is not allowed to refer to path /nix/store/...-expand-response-params.c"
-      cp "$src" expand-response-params.c
-      "$CC" -std=c99 -O3 -o "$out" expand-response-params.c
-      strip -S $out
-      ${optionalString hostPlatform.isLinux "patchelf --shrink-rpath $out"}
-    '';
-  } else "";
+  expand-response-params =
+    if buildPackages.stdenv.cc or null != null && buildPackages.stdenv.cc != "/dev/null"
+    then import ../expand-response-params { inherit (buildPackages) stdenv; }
+    else "";
 
 in
 
diff --git a/pkgs/build-support/expand-response-params/default.nix b/pkgs/build-support/expand-response-params/default.nix
new file mode 100644
index 00000000000..7afbb727fc3
--- /dev/null
+++ b/pkgs/build-support/expand-response-params/default.nix
@@ -0,0 +1,13 @@
+{ stdenv }:
+
+stdenv.mkDerivation {
+  name = "expand-response-params";
+  src = ./expand-response-params.c;
+  buildCommand = ''
+    # Work around "stdenv-darwin-boot-2 is not allowed to refer to path /nix/store/...-expand-response-params.c"
+    cp "$src" expand-response-params.c
+    "$CC" -std=c99 -O3 -o "$out" expand-response-params.c
+    strip -S $out
+    ${stdenv.lib.optionalString stdenv.hostPlatform.isLinux "patchelf --shrink-rpath $out"}
+  '';
+}
diff --git a/pkgs/build-support/cc-wrapper/expand-response-params.c b/pkgs/build-support/expand-response-params/expand-response-params.c
similarity index 100%
rename from pkgs/build-support/cc-wrapper/expand-response-params.c
rename to pkgs/build-support/expand-response-params/expand-response-params.c