diff options
| author | Robert Hensing <robert@roberthensing.nl> | 2021-08-15 17:12:23 +0200 |
|---|---|---|
| committer | Robert Hensing <robert@roberthensing.nl> | 2021-08-15 17:36:41 +0200 |
| commit | fbafeb7ad5dd6196fcc5d84264e1706653a62f81 (patch) | |
| tree | 5e80c4048b4206232b22dc2a8e893e6575ba93d8 /pkgs/development/interpreters | |
| parent | 1359293549af4f8ca536716d0432f3cdd0afe0c6 (diff) | |
treewide: runCommandNoCC -> runCommand
This has been synonymous for ~5y.
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/cling/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/interpreters/python/tests/test_nix_pythonprefix/default.nix | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/development/interpreters/cling/default.nix b/pkgs/development/interpreters/cling/default.nix index 73ed5b523dde..968817cf067a 100644 --- a/pkgs/development/interpreters/cling/default.nix +++ b/pkgs/development/interpreters/cling/default.nix @@ -7,7 +7,6 @@ , fetchgit , makeWrapper , runCommand -, runCommandNoCC , llvmPackages_5 , glibc , ncurses @@ -85,7 +84,7 @@ let # https://github.com/root-project/cling/blob/v0.7/lib/Interpreter/CIFactory.cpp#L107:L111 # Note: it would be nice to just put the compiler in Cling's PATH and let it do this by itself, but # unfortunately passing -nostdinc/-nostdinc++ disables Cling's autodetection logic. - compilerIncludeFlags = runCommandNoCC "compiler-include-flags.txt" {} '' + compilerIncludeFlags = runCommand "compiler-include-flags.txt" {} '' export LC_ALL=C ${stdenv.cc}/bin/c++ -xc++ -E -v /dev/null 2>&1 | sed -n -e '/^.include/,''${' -e '/^ \/.*++/p' -e '}' > tmp sed -e 's/^/-isystem /' -i tmp diff --git a/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/default.nix b/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/default.nix index 572cbdccbfb2..2030fab173a5 100644 --- a/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/default.nix +++ b/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/default.nix @@ -1,4 +1,4 @@ -{ interpreter, writeText, runCommandNoCC }: +{ interpreter, writeText, runCommand }: let @@ -19,7 +19,7 @@ let print(s) ''; -in runCommandNoCC "${interpreter.name}-site-prefix-mypy-test" {} '' +in runCommand "${interpreter.name}-site-prefix-mypy-test" {} '' ${pythonEnv}/bin/mypy ${pythonScript} touch $out '' |