Skip to content

Commit

Permalink
hhvm: fix location of include files in $out
Browse files Browse the repository at this point in the history
Fixes a "double prefix" issue, where parts of the include files
for hhvm where located in `$out/$out/include` instead of `$out/include`.
  • Loading branch information
bennofs committed Mar 6, 2017
1 parent 290297e commit 029c3f9
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions pkgs/development/compilers/hhvm/default.nix
Expand Up @@ -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}
Expand Down

1 comment on commit 029c3f9

@nh2
Copy link
Contributor

@nh2 nh2 commented on 029c3f9 Nov 2, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Linking issue that collects such CMake path issues: #144170

Please sign in to comment.