mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-09-29 15:43:00 +00:00
hhvm: fix location of include files in $out
Fixes a "double prefix" issue, where parts of the include files for hhvm where located in `$out/$out/include` instead of `$out/include`.
This commit is contained in:
parent
290297ecd5
commit
029c3f917e
@ -33,6 +33,11 @@ stdenv.mkDerivation rec {
|
||||
# work around broken build system
|
||||
NIX_CFLAGS_COMPILE = "-I${freetype.dev}/include/freetype2";
|
||||
|
||||
# the cmake package does not handle absolute CMAKE_INSTALL_INCLUDEDIR correctly
|
||||
# (setting it to an absolute path causes include files to go to $out/$out/include,
|
||||
# because the absolute path is interpreted with root at $out).
|
||||
cmakeFlags = "-DCMAKE_INSTALL_INCLUDEDIR=include";
|
||||
|
||||
prePatch = ''
|
||||
substituteInPlace hphp/util/generate-buildinfo.sh \
|
||||
--replace /bin/bash ${stdenv.shell}
|
||||
|
Loading…
Reference in New Issue
Block a user