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" ]; 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.