pkgs/by-name/cm/cmake/000-nixpkgs-cmake-prefix-path.diff

   1 diff --git a/Source/cmFindBase.cxx b/Source/cmFindBase.cxx
   2 index 8840cdcb..c34b7ee9 100644
   3 --- a/Source/cmFindBase.cxx
   4 +++ b/Source/cmFindBase.cxx
   5 @@ -280,6 +280,11 @@ void cmFindBase::FillCMakeEnvironmentPath()
   6    // Add CMAKE_*_PATH environment variables
   7    std::string var = cmStrCat("CMAKE_", this->CMakePathName, "_PATH");
   8    paths.AddEnvPrefixPath("CMAKE_PREFIX_PATH");
   9 +  if (this->CMakePathName != "PROGRAM") {
  10 +    // Like CMAKE_PREFIX_PATH except when searching for programs. Programs need
  11 +    // to be located via PATH
  12 +    paths.AddEnvPrefixPath("NIXPKGS_CMAKE_PREFIX_PATH");
  13 +  }
  14    paths.AddEnvPath(var);
  15
  16    if (this->CMakePathName == "PROGRAM") {
  17 diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
  18 index 9b51b1ad..6acc676c 100644
  19 --- a/Source/cmFindPackageCommand.cxx
  20 +++ b/Source/cmFindPackageCommand.cxx
  21 @@ -2039,6 +2039,7 @@ void cmFindPackageCommand::FillPrefixesCMakeEnvironment()
  22
  23    // And now the general CMake environment variables
  24    paths.AddEnvPath("CMAKE_PREFIX_PATH");
  25 +  paths.AddEnvPath("NIXPKGS_CMAKE_PREFIX_PATH");
  26    if (this->DebugMode) {
  27      debugBuffer = cmStrCat(debugBuffer,
  28                             "CMAKE_PREFIX_PATH env variable "