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
|
{ lib, stdenv, fetchFromGitHub, pkg-config, makeWrapper
|
||||||
, ncurses, libtermkey, lua
|
, copyDesktopItems, makeDesktopItem
|
||||||
, acl ? null, libselinux ? null
|
, ncurses, libtermkey, lua, tre
|
||||||
|
, acl, libselinux
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
@ -17,12 +18,13 @@ stdenv.mkDerivation rec {
|
||||||
owner = "martanne";
|
owner = "martanne";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config makeWrapper ];
|
nativeBuildInputs = [ pkg-config makeWrapper copyDesktopItems ];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
ncurses
|
ncurses
|
||||||
libtermkey
|
libtermkey
|
||||||
luaEnv
|
luaEnv
|
||||||
|
tre
|
||||||
] ++ lib.optionals stdenv.isLinux [
|
] ++ lib.optionals stdenv.isLinux [
|
||||||
acl
|
acl
|
||||||
libselinux
|
libselinux
|
||||||
|
@ -33,28 +35,27 @@ stdenv.mkDerivation rec {
|
||||||
'';
|
'';
|
||||||
|
|
||||||
postInstall = ''
|
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 \
|
wrapProgram $out/bin/vis \
|
||||||
--prefix LUA_CPATH ';' "${luaEnv}/lib/lua/${lua.luaversion}/?.so" \
|
--prefix LUA_CPATH ';' "${luaEnv}/lib/lua/${lua.luaversion}/?.so" \
|
||||||
--prefix LUA_PATH ';' "${luaEnv}/share/lua/${lua.luaversion}/?.lua" \
|
--prefix LUA_PATH ';' "${luaEnv}/share/lua/${lua.luaversion}/?.lua" \
|
||||||
--prefix VIS_PATH : "\$HOME/.config:$out/share/vis"
|
--prefix VIS_PATH : "\$HOME/.config:$out/share/vis"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
desktopItem = makeDesktopItem {
|
desktopItems = [
|
||||||
name = "vis";
|
(makeDesktopItem {
|
||||||
exec = "vis %U";
|
name = "vis";
|
||||||
type = "Application";
|
exec = "vis %U";
|
||||||
icon = "accessories-text-editor";
|
type = "Application";
|
||||||
comment = meta.description;
|
icon = "accessories-text-editor";
|
||||||
desktopName = "vis";
|
comment = meta.description;
|
||||||
genericName = "Text editor";
|
desktopName = "vis";
|
||||||
categories = [ "Application" "Development" "IDE" ];
|
genericName = "Text editor";
|
||||||
mimeTypes = [ "text/plain" "application/octet-stream" ];
|
categories = [ "Application" "Development" "IDE" ];
|
||||||
startupNotify = false;
|
mimeTypes = [ "text/plain" "application/octet-stream" ];
|
||||||
terminal = true;
|
startupNotify = false;
|
||||||
};
|
terminal = true;
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "A vim like editor";
|
description = "A vim like editor";
|
||||||
|
|
Loading…
Reference in a new issue