gnu: packages: Use 'search-patches' everywhere.

[jackhill/guix/guix.git] / gnu / packages / cmake.scm

diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm
index 9b8ebde..1cb1e06 100644 (file)
--- a/gnu/packages/cmake.scm
+++ b/gnu/packages/cmake.scm
@@ -39,13 +39,13 @@
     (version "3.3.2")
     (source (origin
              (method url-fetch)
-             (uri (string-append
-                   "http://www.cmake.org/files/v"
-                   (version-major+minor version)
-                   "/cmake-" version ".tar.gz"))
+             (uri (string-append "https://www.cmake.org/files/v"
+                                 (version-major+minor version)
+                                 "/cmake-" version ".tar.gz"))
              (sha256
-              (base32 "08pwy9ip9cgwgynhn5vrjw8drw29gijy1rmziq22n65zds6ifnp7"))
-             (patches (list (search-patch "cmake-fix-tests.patch")))))
+              (base32
+               "08pwy9ip9cgwgynhn5vrjw8drw29gijy1rmziq22n65zds6ifnp7"))
+             (patches (search-patches "cmake-fix-tests.patch"))))
     (build-system gnu-build-system)
     (arguments
      `(#:test-target "test"
@@ -66,7 +66,8 @@
                          "Source/cmExecProgramCommand.cxx"
                          "Utilities/cmbzip2/Makefile-libbz2_so"
                          "Utilities/Release/release_cmake.cmake"
-                         "Utilities/cmlibarchive/libarchive/archive_write_set_format_shar.c"
+                         "Utilities/cmlibarchive/libarchive/\
+archive_write_set_format_shar.c"
                          "Tests/CMakeLists.txt"
                          "Tests/RunCMake/File_Generate/RunCMakeTest.cmake")
                      (("/bin/sh") (which "sh"))))
@@ -76,7 +77,7 @@
                     ;; Help cmake's bootstrap process to find system libraries
                     (begin
                       (setenv "CMAKE_LIBRARY_PATH" (getenv "LIBRARY_PATH"))
-                      (setenv "CMAKE_INCLUDE_PATH" (getenv "CPATH"))
+                      (setenv "CMAKE_INCLUDE_PATH" (getenv "C_INCLUDE_PATH"))
                       ;; Get verbose output from failed tests
                       (setenv "CTEST_OUTPUT_ON_FAILURE" "TRUE")))
                   (alist-replace