Merge pull request #192943 from KiruyaMomochi/cmake

NixOS · Nov 3, 2022 · 1c0ceea · 1c0ceea
2 parents d7a3a8a + 5245e73
commit 1c0ceea
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/pkgs/development/tools/build-managers/cmake/001-search-path.diff b/pkgs/development/tools/build-managers/cmake/001-search-path.diff
@@ -12,7 +12,7 @@ index b9381c3d7d..5e944640b5 100644
    # CMake install location
    "${_CMAKE_INSTALL_DIR}"
    )
-@@ -47,48 +44,48 @@ endif()
+@@ -47,48 +44,49 @@ endif()
 
  # Non "standard" but common install prefixes
  list(APPEND CMAKE_SYSTEM_PREFIX_PATH
@@ -22,9 +22,10 @@ index b9381c3d7d..5e944640b5 100644
    )
 
  # List common include file locations not under the common prefixes.
-+if(IS_DIRECTORY $ENV{NIX_CC}
-+  AND EXISTS $ENV{NIX_CC}/nix-support/orig-libc
-+  AND EXISTS $ENV{NIX_CC}/nix-support/orig-libc-dev)
++if(DEFINED ENV{NIX_CC}
++  AND IS_DIRECTORY "$ENV{NIX_CC}"
++  AND EXISTS "$ENV{NIX_CC}/nix-support/orig-libc"
++  AND EXISTS "$ENV{NIX_CC}/nix-support/orig-libc-dev")
 +  file(STRINGS "$ENV{NIX_CC}/nix-support/orig-libc" _nix_cmake_libc)
 +  file(STRINGS "$ENV{NIX_CC}/nix-support/orig-libc-dev" _nix_cmake_libc_dev)
 +else()