Merge pull request #176723 from SuperSandro2000/runCommandNoCC

treewide: remove usage of runCommandNoCC aliases
This commit is contained in:
Sandro 2022-06-07 19:03:22 +02:00 committed by GitHub
commit 2d399082aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 6 deletions

View File

@ -19,7 +19,7 @@ let
# per debian's udev deb hook (https://man7.org/linux/man-pages/man1/dh_installudev.1.html)
destination = "60-scdaemon.rules";
scdaemonUdevRulesPkg = pkgs.runCommandNoCC "scdaemon-udev-rules" {} ''
scdaemonUdevRulesPkg = pkgs.runCommand "scdaemon-udev-rules" {} ''
loc="$out/lib/udev/rules.d/"
mkdir -p "''${loc}"
cp "${scdaemonRules}" "''${loc}/${destination}"

View File

@ -98,7 +98,7 @@ in
config = mkIf cfg.enable {
environment.systemPackages = [
(pkgs.runCommandNoCC "captive-browser-desktop-item" { } ''
(pkgs.runCommand "captive-browser-desktop-item" { } ''
install -Dm444 -t $out/share/applications ${desktopItem}/share/applications/*.desktop
'')
];

View File

@ -10,7 +10,6 @@ rec {
*
* Examples:
* runCommand "name" {envVariable = true;} ''echo hello > $out''
* runCommandNoCC "name" {envVariable = true;} ''echo hello > $out'' # equivalent to prior
* runCommandCC "name" {} ''gcc -o myfile myfile.c; cp myfile $out'';
*
* The `*Local` variants force a derivation to be built locally,

View File

@ -1,5 +1,5 @@
{ runCommandNoCC, cargo, neovim, rust-analyzer, rustc }:
runCommandNoCC "test-neovim-rust-analyzer" {
{ runCommand, cargo, neovim, rust-analyzer, rustc }:
runCommand "test-neovim-rust-analyzer" {
nativeBuildInputs = [ cargo neovim rust-analyzer rustc ];
testRustSrc = /* rust */ ''

View File

@ -357,7 +357,7 @@ rec {
} // lib.mapAttrs (_name: type: elixirOr type) lib.types;
};
generate = name: value: pkgs.runCommandNoCC name
generate = name: value: pkgs.runCommand name
{
value = toConf value;
passAsFile = [ "value" ];