diff options
| -rw-r--r-- | nixos/modules/hardware/gpgsmartcards.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/programs/captive-browser.nix | 2 | ||||
| -rw-r--r-- | pkgs/build-support/trivial-builders.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/tools/rust/rust-analyzer/test-neovim-lsp.nix | 4 | ||||
| -rw-r--r-- | pkgs/pkgs-lib/formats.nix | 2 |
5 files changed, 5 insertions, 6 deletions
diff --git a/nixos/modules/hardware/gpgsmartcards.nix b/nixos/modules/hardware/gpgsmartcards.nix index 6e5fcda6b85..4c1d0cc5b2a 100644 --- a/nixos/modules/hardware/gpgsmartcards.nix +++ b/nixos/modules/hardware/gpgsmartcards.nix @@ -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}" diff --git a/nixos/modules/programs/captive-browser.nix b/nixos/modules/programs/captive-browser.nix index aad554c2bd6..1e5c6ff9b24 100644 --- a/nixos/modules/programs/captive-browser.nix +++ b/nixos/modules/programs/captive-browser.nix @@ -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 '') ]; diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index 1e04c9b0e29..c889b3865f6 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -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, diff --git a/pkgs/development/tools/rust/rust-analyzer/test-neovim-lsp.nix b/pkgs/development/tools/rust/rust-analyzer/test-neovim-lsp.nix index 6782a7418a6..963e134075e 100644 --- a/pkgs/development/tools/rust/rust-analyzer/test-neovim-lsp.nix +++ b/pkgs/development/tools/rust/rust-analyzer/test-neovim-lsp.nix @@ -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 */ '' diff --git a/pkgs/pkgs-lib/formats.nix b/pkgs/pkgs-lib/formats.nix index cb46b63dd0c..fc52128a7e9 100644 --- a/pkgs/pkgs-lib/formats.nix +++ b/pkgs/pkgs-lib/formats.nix @@ -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" ]; |