Merge pull request #30808 from andir/fix-luajit-include-directory

luajit: do not override INSTALL_INC
This commit is contained in:
Jörg Thalheim 2017-11-22 13:38:26 +00:00 committed by GitHub
commit acfd95a249
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -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)