From f2ad4a47e8a2cdaa1f9a27e668bebef69c1403f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 29 Nov 2015 08:56:40 +0100 Subject: [PATCH] cmake: remove conditional patch that no longer applies Close #11290. The patch will no longer apply on *any* platform. --- pkgs/development/tools/build-managers/cmake/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 59bcfe45ea2..09e54d3dfa6 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -30,13 +30,8 @@ stdenv.mkDerivation rec { patches = # Don't search in non-Nix locations such as /usr, but do search in # Nixpkgs' Glibc. - optional (stdenv ? glibc) ./search-path-3.2.patch ++ - optional (stdenv ? cross) (fetchurl { - name = "fix-darwin-cross-compile.patch"; - url = "http://public.kitware.com/Bug/file_download.php?" - + "file_id=4981&type=bug"; - sha256 = "16acmdr27adma7gs9rs0dxdiqppm15vl3vv3agy7y8s94wyh4ybv"; - }) ++ stdenv.lib.optional stdenv.isCygwin ./3.2.2-cygwin.patch; + optional (stdenv ? glibc) ./search-path-3.2.patch + ++ optional stdenv.isCygwin ./3.2.2-cygwin.patch; buildInputs = [ bzip2 curl expat libarchive xz zlib ]