public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cmake: remove conditional patch that no longer applies

Browse Source 
Close #11290. The patch will no longer apply on *any* platform.
This commit is contained in:
Vladimír Čunát 2015-11-29 08:56:40 +01:00
parent a936b602b5
commit f2ad4a47e8
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/tools/build-managers/cmake/default.nix
View File

@ -30,13 +30,8 @@ stdenv.mkDerivation rec {
patches = patches =
# Don't search in non-Nix locations such as /usr, but do search in # Don't search in non-Nix locations such as /usr, but do search in
# Nixpkgs' Glibc. # Nixpkgs' Glibc.
optional (stdenv ? glibc) ./search-path-3.2.patch ++ optional (stdenv ? glibc) ./search-path-3.2.patch
optional (stdenv ? cross) (fetchurl { ++ optional stdenv.isCygwin ./3.2.2-cygwin.patch;
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;
buildInputs = buildInputs =
[ bzip2 curl expat libarchive xz zlib ] [ bzip2 curl expat libarchive xz zlib ]