public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

luajit: do not override INSTALL_INC

Browse Source 
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.
This commit is contained in:
Andreas Rammhold 2017-10-25 23:56:41 +02:00
parent 4068703502
commit 0134ccb4dd
No known key found for this signature in database
GPG Key ID: E432E410B5E48C86
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/interpreters/luajit/default.nix
View File

@ -26,7 +26,7 @@ rec {
homepage = http://luajit.org; homepage = http://luajit.org;
license = licenses.mit; license = licenses.mit;
platforms = platforms.linux ++ platforms.darwin; platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers ; [ thoughtpolice smironov vcunat ]; maintainers = with maintainers ; [ thoughtpolice smironov vcunat andir ];
}; };
generic = generic =
@ -61,7 +61,10 @@ rec {
enableParallelBuilding = true; enableParallelBuilding = true;
installPhase = '' 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 ln -s "$out"/bin/luajit-* "$out"/bin/lua
'' ''
+ stdenv.lib.optionalString (!isStable) + stdenv.lib.optionalString (!isStable)