From 5269ed23f2f5b9f9f4618f962a7b3d2efacb4d8e Mon Sep 17 00:00:00 2001 From: Ivan Babrou Date: Sun, 21 Feb 2021 19:29:45 -0800 Subject: [PATCH] cmake: remove obsolete substituteInPlace (#113843) This `substituteInPlace` was introduced in 2016 when cmake was at v3.4: * https://github.com/NixOS/nixpkgs/commit/5286c0aebb In 2018 cmake v3.12.0 changed the code to make it not match anything: * https://github.com/Kitware/CMake/commit/50b5e9ed13 ``` substituteStream(): WARNING: pattern '${PYTHON_EXECUTABLE}' doesn't match anything in file 'Modules/FindCxxTest.cmake' ``` Having it around in 2021 with cmake v3.19.3 doesn't help, and tests are disabled anyway. --- pkgs/development/tools/build-managers/cmake/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 7c2e5372e73..c899647f6aa 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -64,8 +64,6 @@ stdenv.mkDerivation (rec { --subst-var-by libc_bin ${lib.getBin stdenv.cc.libc} \ --subst-var-by libc_dev ${lib.getDev stdenv.cc.libc} \ --subst-var-by libc_lib ${lib.getLib stdenv.cc.libc} - substituteInPlace Modules/FindCxxTest.cmake \ - --replace "$""{PYTHON_EXECUTABLE}" ${stdenv.shell} '' # CC_FOR_BUILD and CXX_FOR_BUILD are used to bootstrap cmake + ''