From 029c3f917edbe4a53fdd17cd797ca6ff9e8a7615 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= Date: Mon, 6 Mar 2017 12:25:43 +0100 Subject: [PATCH] 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`. --- pkgs/development/compilers/hhvm/default.nix | 5 +++++ 1 file changed, 5 insertions(+) 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}