diff options
Diffstat (limited to 'nix')
-rw-r--r-- | nix/buildLisp/default.nix | 10 | ||||
-rw-r--r-- | nix/buildkite/default.nix | 4 | ||||
-rw-r--r-- | nix/renderMarkdown/default.nix | 2 | ||||
-rw-r--r-- | nix/sparseTree/default.nix | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/nix/buildLisp/default.nix b/nix/buildLisp/default.nix index 4266fa18d054..eb85f0ff519d 100644 --- a/nix/buildLisp/default.nix +++ b/nix/buildLisp/default.nix @@ -8,7 +8,7 @@ let inherit (builtins) map elemAt match filter; - inherit (pkgs) lib runCommandNoCC makeWrapper writeText writeShellScriptBin sbcl ecl-static ccl; + inherit (pkgs) lib runCommand makeWrapper writeText writeShellScriptBin sbcl ecl-static ccl; inherit (pkgs.stdenv) targetPlatform; # @@ -187,7 +187,7 @@ let lispNativeDeps = allNative native lispDeps; filteredSrcs = implFilter implementation srcs; in - runCommandNoCC name + runCommand name { LD_LIBRARY_PATH = lib.makeLibraryPath lispNativeDeps; LANG = "C.UTF-8"; @@ -475,7 +475,7 @@ let } $@ ''; - bundled = name: runCommandNoCC "${name}-cllib" + bundled = name: runCommand "${name}-cllib" { passthru = { lispName = name; @@ -640,7 +640,7 @@ let } else null; in - lib.fix (self: runCommandNoCC "${name}-cllib" + lib.fix (self: runCommand "${name}-cllib" { LD_LIBRARY_PATH = lib.makeLibraryPath lispNativeDeps; LANG = "C.UTF-8"; @@ -707,7 +707,7 @@ let } else null; in - lib.fix (self: runCommandNoCC "${name}" + lib.fix (self: runCommand "${name}" { nativeBuildInputs = [ makeWrapper ]; LD_LIBRARY_PATH = libPath; diff --git a/nix/buildkite/default.nix b/nix/buildkite/default.nix index 898c4f5cb8d1..f588b27b52f2 100644 --- a/nix/buildkite/default.nix +++ b/nix/buildkite/default.nix @@ -25,7 +25,7 @@ let toJSON unsafeDiscardStringContext; - inherit (pkgs) lib runCommandNoCC writeText; + inherit (pkgs) lib runCommand writeText; inherit (depot.nix.readTree) mkLabel; in rec { @@ -225,7 +225,7 @@ rec { phases; in - runCommandNoCC "buildkite-pipeline" { } '' + runCommand "buildkite-pipeline" { } '' mkdir $out echo "Generated ${toString (length chunks)} pipeline chunks" ${ diff --git a/nix/renderMarkdown/default.nix b/nix/renderMarkdown/default.nix index 8d6b31cfccca..c5e830c83409 100644 --- a/nix/renderMarkdown/default.nix +++ b/nix/renderMarkdown/default.nix @@ -3,6 +3,6 @@ with depot.nix.yants; -defun [ path drv ] (file: pkgs.runCommandNoCC "${file}.rendered.html" { } '' +defun [ path drv ] (file: pkgs.runCommand "${file}.rendered.html" { } '' cat ${file} | ${depot.tools.cheddar}/bin/cheddar --about-filter ${file} > $out '') diff --git a/nix/sparseTree/default.nix b/nix/sparseTree/default.nix index 16fc9b6103f9..bf56a5348ca3 100644 --- a/nix/sparseTree/default.nix +++ b/nix/sparseTree/default.nix @@ -64,7 +64,7 @@ in # TODO(sterni): teach readTree to also read symlinked directories, # so we ln -sT instead of cp -aT. -pkgs.runCommandNoCC "sparse-${builtins.baseNameOf root}" { } ( +pkgs.runCommand "sparse-${builtins.baseNameOf root}" { } ( lib.concatMapStrings ({ src, dst }: '' mkdir -p "$(dirname "$out${dst}")" |