mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-27 07:30:18 +02:00
Merge pull request #18686 from RamKromberg/fix/vis
vis: 2016-07-15 -> 2016-08-24
This commit is contained in:
commit
39405311b8
|
@ -1,13 +1,13 @@
|
||||||
{ stdenv, fetchFromGitHub, unzip, pkgconfig, makeWrapper
|
{ stdenv, fetchFromGitHub, pkgconfig, makeWrapper, makeDesktopItem
|
||||||
, ncurses, libtermkey, lpeg, lua
|
, ncurses, libtermkey, lpeg, lua
|
||||||
, acl ? null, libselinux ? null
|
, acl ? null, libselinux ? null
|
||||||
, version ? "2016-07-15"
|
, version ? "2016-08-24"
|
||||||
, rev ? "5c2cee9461ef1199f2e80ddcda699595b11fdf08"
|
, rev ? "010dcd60ffda37027908f2a0b20c751b83ca975e"
|
||||||
, sha256 ? "1jmsv72hq0c2f2rnpllvd70cmxbjwfhynzwaxx24f882zlggwsnd"
|
, sha256 ? "0bpbyi5yq50zw0hkh326pmdcnm91paf1yz4853dcq63y0ddv89jp"
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "vis-nightly-${version}";
|
name = "vis-unstable-${version}";
|
||||||
inherit version;
|
inherit version;
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
|
@ -17,10 +17,9 @@ stdenv.mkDerivation rec {
|
||||||
owner = "martanne";
|
owner = "martanne";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper ];
|
nativeBuildInputs = [ pkgconfig makeWrapper ];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
unzip pkgconfig
|
|
||||||
ncurses
|
ncurses
|
||||||
libtermkey
|
libtermkey
|
||||||
lua
|
lua
|
||||||
|
@ -34,18 +33,38 @@ stdenv.mkDerivation rec {
|
||||||
LUA_PATH="${lpeg}/share/lua/${lua.luaversion}/?.lua";
|
LUA_PATH="${lpeg}/share/lua/${lua.luaversion}/?.lua";
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
|
mkdir -p "$out/share/applications"
|
||||||
|
cp $desktopItem/share/applications/* $out/share/applications
|
||||||
echo wrapping $out/bin/vis with runtime environment
|
echo wrapping $out/bin/vis with runtime environment
|
||||||
wrapProgram $out/bin/vis \
|
wrapProgram $out/bin/vis \
|
||||||
--prefix LUA_CPATH : "${lpeg}/lib/lua/${lua.luaversion}/?.so" \
|
--prefix LUA_CPATH : "${lpeg}/lib/lua/${lua.luaversion}/?.so" \
|
||||||
--prefix LUA_PATH : "${lpeg}/share/lua/${lua.luaversion}/?.lua" \
|
--prefix LUA_PATH : "${lpeg}/share/lua/${lua.luaversion}/?.lua" \
|
||||||
--prefix VIS_PATH : "$out/share/vis"
|
--prefix VIS_PATH : "\$HOME/.config:$out/share/vis"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
desktopItem = makeDesktopItem rec {
|
||||||
|
name = "vis";
|
||||||
|
exec = "vis %U";
|
||||||
|
type = "Application";
|
||||||
|
icon = "accessories-text-editor";
|
||||||
|
comment = meta.description;
|
||||||
|
desktopName = "vis";
|
||||||
|
genericName = "Text editor";
|
||||||
|
categories = stdenv.lib.concatStringsSep ";" [
|
||||||
|
"Application" "Development" "IDE"
|
||||||
|
];
|
||||||
|
mimeType = stdenv.lib.concatStringsSep ";" [
|
||||||
|
"text/plain" "application/octet-stream"
|
||||||
|
];
|
||||||
|
startupNotify = "false";
|
||||||
|
terminal = "true";
|
||||||
|
};
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
description = "A vim like editor";
|
description = "A vim like editor";
|
||||||
homepage = http://github.com/martanne/vis;
|
homepage = http://github.com/martanne/vis;
|
||||||
license = licenses.isc;
|
license = licenses.isc;
|
||||||
maintainers = [ maintainers.vrthra ];
|
maintainers = with maintainers; [ vrthra ramkromberg ];
|
||||||
platforms = platforms.unix;
|
platforms = platforms.unix;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue