about summary refs log tree commit diff
path: root/nixpkgs/pkgs/applications/editors/neovim/default.nix
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2019-05-24 18:25:09 +0000
committerAlyssa Ross <hi@alyssa.is>2019-05-24 18:25:09 +0000
commitcb026a2bd22d2656d88a7883e44caa31402d7646 (patch)
tree804c389adfe6dc6deb38dfd90167b03b4f828bce /nixpkgs/pkgs/applications/editors/neovim/default.nix
parent5781972383d0382dc9353ac720a5d751ca17cd05 (diff)
parent650a295621b27c4ebe0fa64a63fd25323e64deb3 (diff)
downloadnixlib-cb026a2bd22d2656d88a7883e44caa31402d7646.tar
nixlib-cb026a2bd22d2656d88a7883e44caa31402d7646.tar.gz
nixlib-cb026a2bd22d2656d88a7883e44caa31402d7646.tar.bz2
nixlib-cb026a2bd22d2656d88a7883e44caa31402d7646.tar.lz
nixlib-cb026a2bd22d2656d88a7883e44caa31402d7646.tar.xz
nixlib-cb026a2bd22d2656d88a7883e44caa31402d7646.tar.zst
nixlib-cb026a2bd22d2656d88a7883e44caa31402d7646.zip
Merge commit '650a295621b27c4ebe0fa64a63fd25323e64deb3'
Diffstat (limited to 'nixpkgs/pkgs/applications/editors/neovim/default.nix')
-rw-r--r--nixpkgs/pkgs/applications/editors/neovim/default.nix4
1 files changed, 1 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/applications/editors/neovim/default.nix b/nixpkgs/pkgs/applications/editors/neovim/default.nix
index a53c499fe5c2..5d623cdfc6db 100644
--- a/nixpkgs/pkgs/applications/editors/neovim/default.nix
+++ b/nixpkgs/pkgs/applications/editors/neovim/default.nix
@@ -80,6 +80,7 @@ in
       "-DGPERF_PRG=${gperf}/bin/gperf"
     ]
     ++ optional doCheck "-DBUSTED_PRG=${neovimLuaEnv}/bin/busted"
+    ++ optional (!lua.pkgs.isLuaJIT) "-DPREFER_LUA=ON"
     ;
 
     # triggers on buffer overflow bug while running tests
@@ -122,8 +123,5 @@ in
       license = with licenses; [ asl20 vim ];
       maintainers = with maintainers; [ manveru garbas rvolosatovs ];
       platforms   = platforms.unix;
-      # `lua: bad light userdata pointer`
-      # https://nix-cache.s3.amazonaws.com/log/9ahcb52905d9d417zsskjpc331iailpq-neovim-unwrapped-0.2.2.drv
-      broken = stdenv.isAarch64;
     };
   }