diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-11-29 08:56:40 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-11-29 08:58:39 +0100 |
| commit | f2ad4a47e8a2cdaa1f9a27e668bebef69c1403f7 (patch) | |
| tree | 4f3b8636902be73f3ed100a0bc7e5d68cb68e596 | |
| parent | a936b602b58bffc2e0a903085fcbbb5df88850ea (diff) | |
| download | nixlib-f2ad4a47e8a2cdaa1f9a27e668bebef69c1403f7.tar nixlib-f2ad4a47e8a2cdaa1f9a27e668bebef69c1403f7.tar.gz nixlib-f2ad4a47e8a2cdaa1f9a27e668bebef69c1403f7.tar.bz2 nixlib-f2ad4a47e8a2cdaa1f9a27e668bebef69c1403f7.tar.lz nixlib-f2ad4a47e8a2cdaa1f9a27e668bebef69c1403f7.tar.xz nixlib-f2ad4a47e8a2cdaa1f9a27e668bebef69c1403f7.tar.zst nixlib-f2ad4a47e8a2cdaa1f9a27e668bebef69c1403f7.zip | |
cmake: remove conditional patch that no longer applies
Close #11290. The patch will no longer apply on *any* platform.
| -rw-r--r-- | pkgs/development/tools/build-managers/cmake/default.nix | 9 |
1 files 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 59bcfe45ea22..09e54d3dfa63 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 ] |