From 0134ccb4dddecd3c5e22289d4665e34f2e6a9510 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Wed, 25 Oct 2017 23:56:41 +0200 Subject: luajit: do not override INSTALL_INC Overriding INSTALL_INC caused luajit to be installed directly into the `include/` directory instead of `include/luajit-${version}` as normally expected. Previously the path indicated in the pkg-config file also did not match the actual header file location. --- pkgs/development/interpreters/luajit/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'pkgs/development/interpreters/luajit') diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix index 3f8554a298e4..ae6ff5985468 100644 --- a/pkgs/development/interpreters/luajit/default.nix +++ b/pkgs/development/interpreters/luajit/default.nix @@ -26,7 +26,7 @@ rec { homepage = http://luajit.org; license = licenses.mit; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers ; [ thoughtpolice smironov vcunat ]; + maintainers = with maintainers ; [ thoughtpolice smironov vcunat andir ]; }; generic = @@ -61,7 +61,10 @@ rec { enableParallelBuilding = true; installPhase = '' - make install INSTALL_INC="$out"/include PREFIX="$out" + make install PREFIX="$out" + for file in "$out"/include/luajit-*/*.h; do + ln -s $file "$out"/include/. + done ln -s "$out"/bin/luajit-* "$out"/bin/lua '' + stdenv.lib.optionalString (!isStable) -- cgit 1.4.1