summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2017-03-31 21:15:27 +0200
committerGitHub <noreply@github.com>2017-03-31 21:15:27 +0200
commita16c2e54201c53b06b40fd940634b7b5d1b76bdd (patch)
tree193205b621fcc4fad658bbe5bb37e34ec6ed3775 /pkgs
parent7408aca5284cb3bc86bdb8e08990fe604f6b8d9c (diff)
parentdf4b6ae3ba69350f7cc5f66fa55e116958459ecf (diff)
downloadnixpkgs-a16c2e54201c53b06b40fd940634b7b5d1b76bdd.tar
nixpkgs-a16c2e54201c53b06b40fd940634b7b5d1b76bdd.tar.gz
nixpkgs-a16c2e54201c53b06b40fd940634b7b5d1b76bdd.tar.bz2
nixpkgs-a16c2e54201c53b06b40fd940634b7b5d1b76bdd.tar.lz
nixpkgs-a16c2e54201c53b06b40fd940634b7b5d1b76bdd.tar.xz
nixpkgs-a16c2e54201c53b06b40fd940634b7b5d1b76bdd.tar.zst
nixpkgs-a16c2e54201c53b06b40fd940634b7b5d1b76bdd.zip
Merge pull request #24356 from vrthra/vis
vis: 2016-10-09 -> 0.3
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/editors/vis/default.nix15
1 files changed, 6 insertions, 9 deletions
diff --git a/pkgs/applications/editors/vis/default.nix b/pkgs/applications/editors/vis/default.nix
index f6760895b57..291c7b1b412 100644
--- a/pkgs/applications/editors/vis/default.nix
+++ b/pkgs/applications/editors/vis/default.nix
@@ -1,18 +1,15 @@
 { stdenv, fetchFromGitHub, pkgconfig, makeWrapper, makeDesktopItem
 , ncurses, libtermkey, lpeg, lua
 , acl ? null, libselinux ? null
-, version ? "2016-10-09"
-, rev ? "b0c9b0063d0b9ed9a7f93c69779749130b353ff1"
-, sha256 ? "0g3242g3r2w38ld3w71f79qp7zzy3zhanff2nhwkwmyq89js8s90"
 }:
 
 stdenv.mkDerivation rec {
-  name = "vis-unstable-${version}";
-  inherit version;
+  name = "vis-${version}";
+  version  = "0.3";
 
   src = fetchFromGitHub {
-    inherit sha256;
-    inherit rev;
+    rev = "v${version}";
+    sha256 = "13xyyq30dg66v4azl2jvlyfyglxmc3r9p7p87vrganq0p6lmb0bk";
     repo = "vis";
     owner = "martanne";
   };
@@ -37,8 +34,8 @@ stdenv.mkDerivation rec {
     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 LUA_CPATH ';' "${lpeg}/lib/lua/${lua.luaversion}/?.so" \
+      --prefix LUA_PATH ';' "${lpeg}/share/lua/${lua.luaversion}/?.lua" \
       --prefix VIS_PATH : "\$HOME/.config:$out/share/vis"
   '';