about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndreas Rammhold <andreas@rammhold.de>2017-10-25 23:56:41 +0200
committerAndreas Rammhold <andreas@rammhold.de>2017-10-26 01:09:54 +0200
commit0134ccb4dddecd3c5e22289d4665e34f2e6a9510 (patch)
tree382e112810903c250a9ca04a7666ce28292a9438
parent4068703502cb2948d09bc419d19e25b1e18502e2 (diff)
downloadnixlib-0134ccb4dddecd3c5e22289d4665e34f2e6a9510.tar
nixlib-0134ccb4dddecd3c5e22289d4665e34f2e6a9510.tar.gz
nixlib-0134ccb4dddecd3c5e22289d4665e34f2e6a9510.tar.bz2
nixlib-0134ccb4dddecd3c5e22289d4665e34f2e6a9510.tar.lz
nixlib-0134ccb4dddecd3c5e22289d4665e34f2e6a9510.tar.xz
nixlib-0134ccb4dddecd3c5e22289d4665e34f2e6a9510.tar.zst
nixlib-0134ccb4dddecd3c5e22289d4665e34f2e6a9510.zip
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.
-rw-r--r--pkgs/development/interpreters/luajit/default.nix7
1 files changed, 5 insertions, 2 deletions
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)