about summary refs log tree commit diff
path: root/pkgs/development/tools/build-managers/cmake
diff options
context:
space:
mode:
authorWilliam A. Kennington III <william@wkennington.com>2015-03-27 11:30:39 -0700
committerWilliam A. Kennington III <william@wkennington.com>2015-03-27 11:30:39 -0700
commit22018c40d186a0969c9bdcb08f091c7f2d88d639 (patch)
tree18a746a93f9caefd46bd0f00cd80287ca8d50046 /pkgs/development/tools/build-managers/cmake
parentdceff137e107fdbcf13b0d645be48e3cc4256d7f (diff)
downloadnixlib-22018c40d186a0969c9bdcb08f091c7f2d88d639.tar
nixlib-22018c40d186a0969c9bdcb08f091c7f2d88d639.tar.gz
nixlib-22018c40d186a0969c9bdcb08f091c7f2d88d639.tar.bz2
nixlib-22018c40d186a0969c9bdcb08f091c7f2d88d639.tar.lz
nixlib-22018c40d186a0969c9bdcb08f091c7f2d88d639.tar.xz
nixlib-22018c40d186a0969c9bdcb08f091c7f2d88d639.tar.zst
nixlib-22018c40d186a0969c9bdcb08f091c7f2d88d639.zip
cmake: Remove obsolete openssl patch
Diffstat (limited to 'pkgs/development/tools/build-managers/cmake')
-rw-r--r--pkgs/development/tools/build-managers/cmake/default.nix6
1 files changed, 1 insertions, 5 deletions
diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index 63e08c8133cd..57ccb086d32d 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -33,11 +33,7 @@ stdenv.mkDerivation rec {
       url = "http://public.kitware.com/Bug/file_download.php?"
           + "file_id=4981&type=bug";
       sha256 = "16acmdr27adma7gs9rs0dxdiqppm15vl3vv3agy7y8s94wyh4ybv";
-    }) ++
-    # fix cmake detection of openssl libs
-    # see: http://public.kitware.com/Bug/bug_relationship_graph.php?bug_id=15386
-    #      and http://www.cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c5d9a8283cfac15b4a5a07f18d5eb10c1f388505#patch1
-    [./cmake_find_openssl_for_openssl-1.0.1m_and_up.patch];
+    });
 
   buildInputs =
     [ bzip2 curl expat libarchive xz zlib ]