diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2014-03-12 06:42:05 +0100 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2014-03-12 10:00:49 +0100 |
| commit | 5eb3dd8a1b952aba821aa55557232ee443dc19bb (patch) | |
| tree | 8ac2d347e1f49120827a1e9d3334bcd3d9ea15b7 | |
| parent | 6998a866a86e934d13c29078963ebfa59fe0f438 (diff) | |
| download | nixpkgs-5eb3dd8a1b952aba821aa55557232ee443dc19bb.tar nixpkgs-5eb3dd8a1b952aba821aa55557232ee443dc19bb.tar.gz nixpkgs-5eb3dd8a1b952aba821aa55557232ee443dc19bb.tar.bz2 nixpkgs-5eb3dd8a1b952aba821aa55557232ee443dc19bb.tar.lz nixpkgs-5eb3dd8a1b952aba821aa55557232ee443dc19bb.tar.xz nixpkgs-5eb3dd8a1b952aba821aa55557232ee443dc19bb.tar.zst nixpkgs-5eb3dd8a1b952aba821aa55557232ee443dc19bb.zip | |
cmake: Add patch for fixing Darwin cross-builds.
This is an upstream patch and will eventually get into the next release. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| -rw-r--r-- | pkgs/development/tools/build-managers/cmake/default.nix | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 9ce69374cd8..42277b22036 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -26,7 +26,13 @@ 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.patch; + optional (stdenv ? glibc) ./search-path.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"; + }); buildInputs = [ curl expat zlib bzip2 libarchive ] ++ optional useNcurses ncurses |