vis: add tre to buildInputs
This commit is contained in:
parent
95af2245a3
commit
8a9a910255
@ -1,6 +1,7 @@
|
||||
{ lib, stdenv, fetchFromGitHub, pkg-config, makeWrapper, makeDesktopItem
|
||||
, ncurses, libtermkey, lua
|
||||
, acl ? null, libselinux ? null
|
||||
{ lib, stdenv, fetchFromGitHub, pkg-config, makeWrapper
|
||||
, copyDesktopItems, makeDesktopItem
|
||||
, ncurses, libtermkey, lua, tre
|
||||
, acl, libselinux
|
||||
}:
|
||||
|
||||
let
|
||||
@ -17,12 +18,13 @@ stdenv.mkDerivation rec {
|
||||
owner = "martanne";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config makeWrapper ];
|
||||
nativeBuildInputs = [ pkg-config makeWrapper copyDesktopItems ];
|
||||
|
||||
buildInputs = [
|
||||
ncurses
|
||||
libtermkey
|
||||
luaEnv
|
||||
tre
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
acl
|
||||
libselinux
|
||||
@ -33,16 +35,14 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p "$out/share/applications"
|
||||
cp $desktopItem/share/applications/* $out/share/applications
|
||||
echo wrapping $out/bin/vis with runtime environment
|
||||
wrapProgram $out/bin/vis \
|
||||
--prefix LUA_CPATH ';' "${luaEnv}/lib/lua/${lua.luaversion}/?.so" \
|
||||
--prefix LUA_PATH ';' "${luaEnv}/share/lua/${lua.luaversion}/?.lua" \
|
||||
--prefix VIS_PATH : "\$HOME/.config:$out/share/vis"
|
||||
'';
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "vis";
|
||||
exec = "vis %U";
|
||||
type = "Application";
|
||||
@ -54,7 +54,8 @@ stdenv.mkDerivation rec {
|
||||
mimeTypes = [ "text/plain" "application/octet-stream" ];
|
||||
startupNotify = false;
|
||||
terminal = true;
|
||||
};
|
||||
})
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A vim like editor";
|
||||
|
Loading…
Reference in New Issue
Block a user