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

cmake_2_8: fix build, restore search-path.patch

Browse Source 
cmake 3.12 update in #44910 modified search-path.patch
and broke cmake 2.8. This restores the previous version
of the patch as search-path-2.8.patch
This commit is contained in:
Uli Baum
2018-08-31 01:04:44 +02:00
parent d3036afd6d
commit 8aa09a2887
2 changed files with 93 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/tools/build-managers/cmake/2.8.nix
+1 -1
View File
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
sha256 = "136z63ff83hnwd247cq4m8m8164pklzyl5i2csf5h6wd8p01pdkj";
})] ++
# Don't search in non-Nix locations such as /usr, but do search in our libc.
[ ./search-path.patch ] ++
[ ./search-path-2.8.patch ] ++
optional (hostPlatform != buildPlatform) (fetchurl {
name = "fix-darwin-cross-compile.patch";
url = "https://public.kitware.com/Bug/file_download.php?"