From a4de5cfd2f75f19d751a2f37d758b500bfd19a7e Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Tue, 3 Dec 2019 00:13:03 +0100
Subject: gnu: Remove cmake/fixed.

* gnu/packages/cmake.scm (cmake/fixed): Remove variable.
(cmake-minimal)[source](patches): Add "cmake-curl-certificates.patch".
---
 gnu/packages/cmake.scm | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm
index 5c9b9810c8..135863f6c2 100644
--- a/gnu/packages/cmake.scm
+++ b/gnu/packages/cmake.scm
@@ -75,7 +75,8 @@ (define-public cmake-minimal
                                 "cmliblzma"
                                 ;; "cmlibuv"
                                 "cmzlib"))
-                    #t)))))
+                    #t)))
+              (patches (search-patches "cmake-curl-certificates.patch"))))
     (build-system gnu-build-system)
     (arguments
      `(#:test-target "test"
@@ -209,18 +210,6 @@ (define-public cmake
     (outputs '("out" "doc"))
     (properties (alist-delete 'hidden? (package-properties cmake-minimal)))))
 
-(define-public cmake/fixed
-  ;; This is a variant of CMake that fixes X.509 certificate lookup:
-  ;; <https://issues.guix.gnu.org/issue/37371>.
-  (package
-    (inherit cmake)
-    (version (string-append (package-version cmake) "-1"))
-    (source (origin
-              (inherit (package-source cmake))
-              (patches
-               (append (search-patches "cmake-curl-certificates.patch")
-                       (origin-patches (package-source cmake))))))))
-
 (define-public cmake-minimal-cross
   (package
     (inherit cmake-minimal)
-- 
cgit v1.2.3