Merge pull request #176723 from SuperSandro2000/runCommandNoCC

treewide: remove usage of runCommandNoCC aliases

authored by

Sandro and committed by
GitHub
2d399082 0e5b34f8

+5 -6
+1 -1
nixos/modules/hardware/gpgsmartcards.nix
··· 19 # per debian's udev deb hook (https://man7.org/linux/man-pages/man1/dh_installudev.1.html) 20 destination = "60-scdaemon.rules"; 21 22 - scdaemonUdevRulesPkg = pkgs.runCommandNoCC "scdaemon-udev-rules" {} '' 23 loc="$out/lib/udev/rules.d/" 24 mkdir -p "''${loc}" 25 cp "${scdaemonRules}" "''${loc}/${destination}"
··· 19 # per debian's udev deb hook (https://man7.org/linux/man-pages/man1/dh_installudev.1.html) 20 destination = "60-scdaemon.rules"; 21 22 + scdaemonUdevRulesPkg = pkgs.runCommand "scdaemon-udev-rules" {} '' 23 loc="$out/lib/udev/rules.d/" 24 mkdir -p "''${loc}" 25 cp "${scdaemonRules}" "''${loc}/${destination}"
+1 -1
nixos/modules/programs/captive-browser.nix
··· 98 99 config = mkIf cfg.enable { 100 environment.systemPackages = [ 101 - (pkgs.runCommandNoCC "captive-browser-desktop-item" { } '' 102 install -Dm444 -t $out/share/applications ${desktopItem}/share/applications/*.desktop 103 '') 104 ];
··· 98 99 config = mkIf cfg.enable { 100 environment.systemPackages = [ 101 + (pkgs.runCommand "captive-browser-desktop-item" { } '' 102 install -Dm444 -t $out/share/applications ${desktopItem}/share/applications/*.desktop 103 '') 104 ];
-1
pkgs/build-support/trivial-builders.nix
··· 10 * 11 * Examples: 12 * runCommand "name" {envVariable = true;} ''echo hello > $out'' 13 - * runCommandNoCC "name" {envVariable = true;} ''echo hello > $out'' # equivalent to prior 14 * runCommandCC "name" {} ''gcc -o myfile myfile.c; cp myfile $out''; 15 * 16 * The `*Local` variants force a derivation to be built locally,
··· 10 * 11 * Examples: 12 * runCommand "name" {envVariable = true;} ''echo hello > $out'' 13 * runCommandCC "name" {} ''gcc -o myfile myfile.c; cp myfile $out''; 14 * 15 * The `*Local` variants force a derivation to be built locally,
+2 -2
pkgs/development/tools/rust/rust-analyzer/test-neovim-lsp.nix
··· 1 - { runCommandNoCC, cargo, neovim, rust-analyzer, rustc }: 2 - runCommandNoCC "test-neovim-rust-analyzer" { 3 nativeBuildInputs = [ cargo neovim rust-analyzer rustc ]; 4 5 testRustSrc = /* rust */ ''
··· 1 + { runCommand, cargo, neovim, rust-analyzer, rustc }: 2 + runCommand "test-neovim-rust-analyzer" { 3 nativeBuildInputs = [ cargo neovim rust-analyzer rustc ]; 4 5 testRustSrc = /* rust */ ''
+1 -1
pkgs/pkgs-lib/formats.nix
··· 357 } // lib.mapAttrs (_name: type: elixirOr type) lib.types; 358 }; 359 360 - generate = name: value: pkgs.runCommandNoCC name 361 { 362 value = toConf value; 363 passAsFile = [ "value" ];
··· 357 } // lib.mapAttrs (_name: type: elixirOr type) lib.types; 358 }; 359 360 + generate = name: value: pkgs.runCommand name 361 { 362 value = toConf value; 363 passAsFile = [ "value" ];