b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #176723 from SuperSandro2000/runCommandNoCC

Browse source 
treewide: remove usage of runCommandNoCC aliases
This commit is contained in:
Sandro 2022-06-07 19:03:22 +02:00 committed by GitHub
parent 0e5b34f801 43d4ddf28e
commit 2d399082aa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/hardware/gpgsmartcards.nix
View file

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

2
nixos/modules/programs/captive-browser.nix
View file

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

1
pkgs/build-support/trivial-builders.nix
View file

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

4
pkgs/development/tools/rust/rust-analyzer/test-neovim-lsp.nix
View file

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

2
pkgs/pkgs-lib/formats.nix
View file

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