summary refs log tree commit diff
path: root/pkgs/development/interpreters/lua-5/5.1.nix
diff options
context:
space:
mode:
authorBjørn Forsman <bjorn.forsman@gmail.com>2014-07-29 18:36:28 +0200
committerBjørn Forsman <bjorn.forsman@gmail.com>2014-07-29 18:42:20 +0200
commit559eaeb2d2b9197d36505a5563c7185ed6371f6f (patch)
tree44ecbf44075cafdff01a3d7361d1057048d10349 /pkgs/development/interpreters/lua-5/5.1.nix
parentfc81ff49d2e4927c5b86cfabeaa4067f6760e41f (diff)
downloadnixlib-559eaeb2d2b9197d36505a5563c7185ed6371f6f.tar
nixlib-559eaeb2d2b9197d36505a5563c7185ed6371f6f.tar.gz
nixlib-559eaeb2d2b9197d36505a5563c7185ed6371f6f.tar.bz2
nixlib-559eaeb2d2b9197d36505a5563c7185ed6371f6f.tar.lz
nixlib-559eaeb2d2b9197d36505a5563c7185ed6371f6f.tar.xz
nixlib-559eaeb2d2b9197d36505a5563c7185ed6371f6f.tar.zst
nixlib-559eaeb2d2b9197d36505a5563c7185ed6371f6f.zip
Revert "use wrapper to set LUA_PATH variable"
This reverts commit 807cd4b4d40813ff1d801b0b17de3c421a465b1b, as it
broke the 'awesome' package. It was also an incomplete change, only
modifying lua-5.1 and none of the other lua versions.

A better approach, if wanting lua to pick up external modules, would be
to loop over $NIX_PROFILES. $NIX_PROFILES is unset in build
environments, so it should be safe.

Conflicts:
	pkgs/development/interpreters/lua-5/5.1.nix
Diffstat (limited to 'pkgs/development/interpreters/lua-5/5.1.nix')
-rw-r--r--pkgs/development/interpreters/lua-5/5.1.nix7
1 files changed, 2 insertions, 5 deletions
diff --git a/pkgs/development/interpreters/lua-5/5.1.nix b/pkgs/development/interpreters/lua-5/5.1.nix
index 8fefcb0ec6db..74f80b911a0c 100644
--- a/pkgs/development/interpreters/lua-5/5.1.nix
+++ b/pkgs/development/interpreters/lua-5/5.1.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, readline, makeWrapper }:
+{ stdenv, fetchurl, readline }:
 
 let
   dsoPatch = fetchurl {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     sha256 = "2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333";
   };
 
-  buildInputs = [ readline makeWrapper ];
+  buildInputs = [ readline ];
 
   patches = if stdenv.isDarwin then [ ./5.1.darwin.patch ] else [ dsoPatch ];
 
@@ -35,9 +35,6 @@ stdenv.mkDerivation rec {
     sed <"etc/lua.pc" >"$out/lib/pkgconfig/lua.pc" -e "s|^prefix=.*|prefix=$out|"
     mv "doc/"*.{gif,png,css,html} "$out/share/doc/lua/"
     rmdir $out/{share,lib}/lua/5.1 $out/{share,lib}/lua
-    wrapProgram $out/bin/lua \
-      --set LUA_PATH  '"$HOME/.nix-profile/lib/lua/5.1/?.lua;$HOME/.nix-profile/share/lua/5.1/?.lua"' \
-      --set LUA_CPATH '"$HOME/.nix-profile/lib/lua/5.1/?.so;$HOME/.nix-profile/share/lua/5.1/?.so"'
   '';
 
   meta = {