Merge pull request #24356 from vrthra/vis

vis: 2016-10-09 -> 0.3
This commit is contained in:
Jörg Thalheim 2017-03-31 21:15:27 +02:00 committed by GitHub
commit a16c2e5420

View File

@ -1,18 +1,15 @@
{ stdenv, fetchFromGitHub, pkgconfig, makeWrapper, makeDesktopItem { stdenv, fetchFromGitHub, pkgconfig, makeWrapper, makeDesktopItem
, ncurses, libtermkey, lpeg, lua , ncurses, libtermkey, lpeg, lua
, acl ? null, libselinux ? null , acl ? null, libselinux ? null
, version ? "2016-10-09"
, rev ? "b0c9b0063d0b9ed9a7f93c69779749130b353ff1"
, sha256 ? "0g3242g3r2w38ld3w71f79qp7zzy3zhanff2nhwkwmyq89js8s90"
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "vis-unstable-${version}"; name = "vis-${version}";
inherit version; version = "0.3";
src = fetchFromGitHub { src = fetchFromGitHub {
inherit sha256; rev = "v${version}";
inherit rev; sha256 = "13xyyq30dg66v4azl2jvlyfyglxmc3r9p7p87vrganq0p6lmb0bk";
repo = "vis"; repo = "vis";
owner = "martanne"; owner = "martanne";
}; };
@ -37,8 +34,8 @@ stdenv.mkDerivation rec {
cp $desktopItem/share/applications/* $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 : "\$HOME/.config:$out/share/vis" --prefix VIS_PATH : "\$HOME/.config:$out/share/vis"
''; '';