From 09dd97398783f4240029bd219de53d42e8de2473 Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Wed, 26 Jul 2023 21:57:49 -0400
Subject: [PATCH 1/2] writers: use callPackages to import sub-groups of writers

Use callPackages instead of plain import to get proper splicing. Without this,
writeNginxConfig fails when cross-compiling.
---
 pkgs/build-support/writers/default.nix | 10 +++-------
 pkgs/build-support/writers/scripts.nix | 11 +----------
 2 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/pkgs/build-support/writers/default.nix b/pkgs/build-support/writers/default.nix
index 5ef579422195..a161322cd35b 100644
--- a/pkgs/build-support/writers/default.nix
+++ b/pkgs/build-support/writers/default.nix
@@ -1,17 +1,13 @@
-{ pkgs, config, lib }:
+{ config, lib, callPackages }:
 
 let
   aliases = if config.allowAliases then (import ./aliases.nix lib) else prev: {};
 
   # Writers for JSON-like data structures
-  dataWriters = import ./data.nix {
-    inherit lib; inherit (pkgs) runCommandNoCC dasel;
-  };
+  dataWriters = callPackages ./data.nix { };
 
   # Writers for scripts
-  scriptWriters = import ./scripts.nix {
-    inherit lib pkgs;
-  };
+  scriptWriters = callPackages ./scripts.nix { };
 
   writers = scriptWriters // dataWriters;
 in
diff --git a/pkgs/build-support/writers/scripts.nix b/pkgs/build-support/writers/scripts.nix
index b8c5964c3fa3..7fc47fbcdf94 100644
--- a/pkgs/build-support/writers/scripts.nix
+++ b/pkgs/build-support/writers/scripts.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib }:
+{ pkgs, buildPackages, lib, stdenv, libiconv, mkNugetDeps, mkNugetSource, gixy }:
 let
   inherit (lib)
     concatMapStringsSep
@@ -10,15 +10,6 @@ let
     strings
     types
     ;
-
-  inherit (pkgs)
-    buildPackages
-    gixy
-    libiconv
-    mkNugetDeps
-    mkNugetSource
-    stdenv
-    ;
 in
 rec {
   # Base implementation for non-compiled executables.

From 025af4730357856f6639cef0b2e75255d7b9c30d Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Fri, 28 Jul 2023 00:39:21 -0400
Subject: [PATCH 2/2] writers: use runCommand instead of runCommandNoCC

runCommandNoCC is now an alias for runCommand, which was causing ofborg
failures with allowAliases = false.
---
 pkgs/build-support/writers/data.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/writers/data.nix b/pkgs/build-support/writers/data.nix
index a080f8c29d0e..48f9bc547ed3 100644
--- a/pkgs/build-support/writers/data.nix
+++ b/pkgs/build-support/writers/data.nix
@@ -1,4 +1,4 @@
-{ lib, runCommandNoCC, dasel }:
+{ lib, runCommand, dasel }:
 let
   daselBin = lib.getExe dasel;
 
@@ -28,7 +28,7 @@ rec {
     let
       name = last (builtins.split "/" nameOrPath);
     in
-    runCommandNoCC name
+    runCommand name
       {
         input = input data;
         passAsFile = [ "input" ];