diff options
| author | Adam Joseph <54836058+amjoseph-nixpkgs@users.noreply.github.com> | 2023-11-08 06:15:46 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-08 06:15:46 +0000 |
| commit | ba2ed469c261928415e1121f26bfe96ebbed8a33 (patch) | |
| tree | 806254c8497062bce2f1d43b4602002290a4ae1a /pkgs/development/tools | |
| parent | 4c234ceeb61f6d111bb1db30376cdb4019e56142 (diff) | |
| parent | 3db5de3ba9909bc8631fe6808638099a5cad0a49 (diff) | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/development/tools')
| -rw-r--r-- | pkgs/development/tools/fdroidserver/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/ycmd/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/tools/fdroidserver/default.nix b/pkgs/development/tools/fdroidserver/default.nix index da7b0d662b32a..ee4d64f118f28 100644 --- a/pkgs/development/tools/fdroidserver/default.nix +++ b/pkgs/development/tools/fdroidserver/default.nix @@ -47,7 +47,7 @@ buildPythonApplication rec { ''; preConfigure = '' - ${python3.pythonForBuild.interpreter} setup.py compile_catalog + ${python3.pythonOnBuildForHost.interpreter} setup.py compile_catalog ''; postInstall = '' diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix index f281a70f8029d..ea725b013180b 100644 --- a/pkgs/development/tools/misc/ycmd/default.nix +++ b/pkgs/development/tools/misc/ycmd/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { buildPhase = '' export EXTRA_CMAKE_ARGS="-DPATH_TO_LLVM_ROOT=${llvmPackages.libllvm} -DUSE_SYSTEM_ABSEIL=true" - ${python.pythonForBuild.interpreter} build.py --system-libclang --clang-completer --ninja + ${python.pythonOnBuildForHost.interpreter} build.py --system-libclang --clang-completer --ninja ''; dontConfigure = true; |