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
{ lib, stdenv, fetchFromGitHub, pkg-config, makeWrapper, makeDesktopItem
2
-
, ncurses, libtermkey, lpeg, lua
3
, acl ? null, libselinux ? null
4
}:
5
0
0
0
6
stdenv.mkDerivation rec {
7
pname = "vis";
8
version = "0.7";
···
19
buildInputs = [
20
ncurses
21
libtermkey
22
-
lua
23
-
lpeg
24
] ++ lib.optionals stdenv.isLinux [
25
acl
26
libselinux
···
30
patchShebangs ./configure
31
'';
32
33
-
LUA_CPATH="${lpeg}/lib/lua/${lua.luaversion}/?.so;";
34
-
LUA_PATH="${lpeg}/share/lua/${lua.luaversion}/?.lua";
35
-
36
postInstall = ''
37
mkdir -p "$out/share/applications"
38
cp $desktopItem/share/applications/* $out/share/applications
39
echo wrapping $out/bin/vis with runtime environment
40
wrapProgram $out/bin/vis \
41
-
--prefix LUA_CPATH ';' "${lpeg}/lib/lua/${lua.luaversion}/?.so" \
42
-
--prefix LUA_PATH ';' "${lpeg}/share/lua/${lua.luaversion}/?.lua" \
43
--prefix VIS_PATH : "\$HOME/.config:$out/share/vis"
44
'';
45
···
1
{ lib, stdenv, fetchFromGitHub, pkg-config, makeWrapper, makeDesktopItem
2
+
, ncurses, libtermkey, lua
3
, acl ? null, libselinux ? null
4
}:
5
6
+
let
7
+
luaEnv = lua.withPackages(ps: [ps.lpeg]);
8
+
in
9
stdenv.mkDerivation rec {
10
pname = "vis";
11
version = "0.7";
···
22
buildInputs = [
23
ncurses
24
libtermkey
25
+
luaEnv
0
26
] ++ lib.optionals stdenv.isLinux [
27
acl
28
libselinux
···
32
patchShebangs ./configure
33
'';
34
0
0
0
35
postInstall = ''
36
mkdir -p "$out/share/applications"
37
cp $desktopItem/share/applications/* $out/share/applications
38
echo wrapping $out/bin/vis with runtime environment
39
wrapProgram $out/bin/vis \
40
+
--prefix LUA_CPATH ';' "${luaEnv}/lib/lua/${lua.luaversion}/?.so" \
41
+
--prefix LUA_PATH ';' "${luaEnv}/share/lua/${lua.luaversion}/?.lua" \
42
--prefix VIS_PATH : "\$HOME/.config:$out/share/vis"
43
'';
44
+1
-3
pkgs/top-level/all-packages.nix
···
28187
28188
neovim-remote = callPackage ../applications/editors/neovim/neovim-remote.nix { };
28189
28190
-
vis = callPackage ../applications/editors/vis {
28191
-
inherit (lua52Packages) lpeg;
28192
-
};
28193
28194
viw = callPackage ../applications/editors/viw { };
28195
···
28187
28188
neovim-remote = callPackage ../applications/editors/neovim/neovim-remote.nix { };
28189
28190
+
vis = callPackage ../applications/editors/vis { };
0
0
28191
28192
viw = callPackage ../applications/editors/viw { };
28193