diff options
author | Joachim F <joachifm@users.noreply.github.com> | 2016-09-18 13:52:37 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-09-18 13:52:37 +0200 |
commit | 39405311b8ec7ab386cf2a5da46d6d276bea0eee (patch) | |
tree | e29492b2685648e681a7139e7a0c9e5fd4e277ba | |
parent | 19898d8284399fc9e297ad58eedba3f3abac8d9c (diff) | |
parent | 59730d32dacc4f03e83fcc1f62ddf38382faff1f (diff) | |
download | nixpkgs-39405311b8ec7ab386cf2a5da46d6d276bea0eee.tar nixpkgs-39405311b8ec7ab386cf2a5da46d6d276bea0eee.tar.gz nixpkgs-39405311b8ec7ab386cf2a5da46d6d276bea0eee.tar.bz2 nixpkgs-39405311b8ec7ab386cf2a5da46d6d276bea0eee.tar.lz nixpkgs-39405311b8ec7ab386cf2a5da46d6d276bea0eee.tar.xz nixpkgs-39405311b8ec7ab386cf2a5da46d6d276bea0eee.tar.zst nixpkgs-39405311b8ec7ab386cf2a5da46d6d276bea0eee.zip |
Merge pull request #18686 from RamKromberg/fix/vis
vis: 2016-07-15 -> 2016-08-24
-rw-r--r-- | pkgs/applications/editors/vis/default.nix | 37 |
1 files changed, 28 insertions, 9 deletions
diff --git a/pkgs/applications/editors/vis/default.nix b/pkgs/applications/editors/vis/default.nix index 41994563ee3..72a4bfe57b8 100644 --- a/pkgs/applications/editors/vis/default.nix +++ b/pkgs/applications/editors/vis/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchFromGitHub, unzip, pkgconfig, makeWrapper +{ stdenv, fetchFromGitHub, pkgconfig, makeWrapper, makeDesktopItem , ncurses, libtermkey, lpeg, lua , acl ? null, libselinux ? null -, version ? "2016-07-15" -, rev ? "5c2cee9461ef1199f2e80ddcda699595b11fdf08" -, sha256 ? "1jmsv72hq0c2f2rnpllvd70cmxbjwfhynzwaxx24f882zlggwsnd" +, version ? "2016-08-24" +, rev ? "010dcd60ffda37027908f2a0b20c751b83ca975e" +, sha256 ? "0bpbyi5yq50zw0hkh326pmdcnm91paf1yz4853dcq63y0ddv89jp" }: stdenv.mkDerivation rec { - name = "vis-nightly-${version}"; + name = "vis-unstable-${version}"; inherit version; src = fetchFromGitHub { @@ -17,10 +17,9 @@ stdenv.mkDerivation rec { owner = "martanne"; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ pkgconfig makeWrapper ]; buildInputs = [ - unzip pkgconfig ncurses libtermkey lua @@ -34,18 +33,38 @@ stdenv.mkDerivation rec { LUA_PATH="${lpeg}/share/lua/${lua.luaversion}/?.lua"; 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 : "${lpeg}/lib/lua/${lua.luaversion}/?.so" \ --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; { description = "A vim like editor"; homepage = http://github.com/martanne/vis; license = licenses.isc; - maintainers = [ maintainers.vrthra ]; + maintainers = with maintainers; [ vrthra ramkromberg ]; platforms = platforms.unix; }; } |