about summary refs log tree commit diff
diff options
context:
space:
mode:
authorBenno Fünfstück <benno.fuenfstueck@gmail.com>2017-03-06 12:25:43 +0100
committerBenno Fünfstück <benno.fuenfstueck@gmail.com>2017-03-06 12:26:54 +0100
commit029c3f917edbe4a53fdd17cd797ca6ff9e8a7615 (patch)
tree40e377cecf107aa66f259b01859fadf6e51dd076
parent290297ecd57f1f825d63991c7efa098333389bd4 (diff)
downloadnixlib-029c3f917edbe4a53fdd17cd797ca6ff9e8a7615.tar
nixlib-029c3f917edbe4a53fdd17cd797ca6ff9e8a7615.tar.gz
nixlib-029c3f917edbe4a53fdd17cd797ca6ff9e8a7615.tar.bz2
nixlib-029c3f917edbe4a53fdd17cd797ca6ff9e8a7615.tar.lz
nixlib-029c3f917edbe4a53fdd17cd797ca6ff9e8a7615.tar.xz
nixlib-029c3f917edbe4a53fdd17cd797ca6ff9e8a7615.tar.zst
nixlib-029c3f917edbe4a53fdd17cd797ca6ff9e8a7615.zip
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`.
-rw-r--r--pkgs/development/compilers/hhvm/default.nix5
1 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/development/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix
index e6f98a121946..f0f3a130ef68 100644
--- a/pkgs/development/compilers/hhvm/default.nix
+++ b/pkgs/development/compilers/hhvm/default.nix
@@ -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}