tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
vis: simplify thanks to lua update
Matthieu Coudron
4 years ago
823d0d83
e9c921a3
+8
-11
2 changed files
expand all
collapse all
unified
split
pkgs
applications
editors
vis
default.nix
top-level
all-packages.nix
+7
-8
pkgs/applications/editors/vis/default.nix
···
1
1
{ lib, stdenv, fetchFromGitHub, pkg-config, makeWrapper, makeDesktopItem
2
2
-
, ncurses, libtermkey, lpeg, lua
2
2
+
, ncurses, libtermkey, lua
3
3
, acl ? null, libselinux ? null
4
4
}:
5
5
6
6
+
let
7
7
+
luaEnv = lua.withPackages(ps: [ps.lpeg]);
8
8
+
in
6
9
stdenv.mkDerivation rec {
7
10
pname = "vis";
8
11
version = "0.7";
···
19
22
buildInputs = [
20
23
ncurses
21
24
libtermkey
22
22
-
lua
23
23
-
lpeg
25
25
+
luaEnv
24
26
] ++ lib.optionals stdenv.isLinux [
25
27
acl
26
28
libselinux
···
30
32
patchShebangs ./configure
31
33
'';
32
34
33
33
-
LUA_CPATH="${lpeg}/lib/lua/${lua.luaversion}/?.so;";
34
34
-
LUA_PATH="${lpeg}/share/lua/${lua.luaversion}/?.lua";
35
35
-
36
35
postInstall = ''
37
36
mkdir -p "$out/share/applications"
38
37
cp $desktopItem/share/applications/* $out/share/applications
39
38
echo wrapping $out/bin/vis with runtime environment
40
39
wrapProgram $out/bin/vis \
41
41
-
--prefix LUA_CPATH ';' "${lpeg}/lib/lua/${lua.luaversion}/?.so" \
42
42
-
--prefix LUA_PATH ';' "${lpeg}/share/lua/${lua.luaversion}/?.lua" \
40
40
+
--prefix LUA_CPATH ';' "${luaEnv}/lib/lua/${lua.luaversion}/?.so" \
41
41
+
--prefix LUA_PATH ';' "${luaEnv}/share/lua/${lua.luaversion}/?.lua" \
43
42
--prefix VIS_PATH : "\$HOME/.config:$out/share/vis"
44
43
'';
45
44
+1
-3
pkgs/top-level/all-packages.nix
···
28187
28187
28188
28188
neovim-remote = callPackage ../applications/editors/neovim/neovim-remote.nix { };
28189
28189
28190
28190
-
vis = callPackage ../applications/editors/vis {
28191
28191
-
inherit (lua52Packages) lpeg;
28192
28192
-
};
28190
28190
+
vis = callPackage ../applications/editors/vis { };
28193
28191
28194
28192
viw = callPackage ../applications/editors/viw { };
28195
28193