tjh.dev / nixpkgs
nixpkgs mirror (for testing) github.com/NixOS/nixpkgs
nix
fork atom
nixpkgs / pkgs / by-name / cm / cmake / nixpkgs-cmake-prefix-path.patch
at python-updates 28 lines 1.2 kB view raw
1diff --git a/Source/cmFindBase.cxx b/Source/cmFindBase.cxx 2index b8d4765692..902c1e5290 100644 3--- a/Source/cmFindBase.cxx 4+++ b/Source/cmFindBase.cxx 5@@ -312,6 +312,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") { 17diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx 18index 6201894fd1..9533862a2b 100644 19--- a/Source/cmFindPackageCommand.cxx 20+++ b/Source/cmFindPackageCommand.cxx 21@@ -2467,6 +2467,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->DebugModeEnabled()) { 27 debugBuffer = cmStrCat(debugBuffer, 28 "CMAKE_PREFIX_PATH env variable "