Merge pull request #5098 from k0ral/girara

girara: alternative installation that doesn't require ncurses or gcc-4.9

pkgs/applications/misc/girara/default.nix

@@ -1,19 +1,27 @@
-{ stdenv, fetchurl, pkgconfig, gtk, gettext, ncurses }:
+{ stdenv, fetchurl, pkgconfig, gtk, gettext, withBuildColors ? true, ncurses ? null}:
 
+assert withBuildColors -> ncurses != null;
+
+with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "girara-0.2.3";
+  name = "girara-${version}";
+  version = "0.2.3";
 
   src = fetchurl {
     url = "http://pwmt.org/projects/girara/download/${name}.tar.gz";
     sha256 = "1phfmqp8y17zcy9yi6pm2f80x8ldbk60iswpm4bmjz5217jwqzxh";
   };
 
+  preConfigure = ''
+    sed -i 's/ifdef TPUT_AVAILABLE/ifneq ($(TPUT_AVAILABLE), 0)/' colors.mk
+  '';
+
   buildInputs = [ pkgconfig gtk gettext ];
 
-  makeFlags = [
-    "PREFIX=$(out)"
-    "TPUT=${ncurses}/bin/tput"
-  ];
+  makeFlags = [ "PREFIX=$(out)" ]
+    ++ optional withBuildColors "TPUT=${ncurses}/bin/tput"
+    ++ optional (!withBuildColors) "TPUT_AVAILABLE=0"
+    ;
 
   meta = {
     homepage = http://pwmt.org/projects/girara/;
@@ -22,9 +30,8 @@ stdenv.mkDerivation rec {
       girara is a library that implements a GTK+ based VIM-like user interface
       that focuses on simplicity and minimalism.
     '';
-    license = stdenv.lib.licenses.zlib;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.garbas ];
+    license = licenses.zlib;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.garbas ];
   };
 }
-

pkgs/top-level/all-packages.nix

@@ -11304,6 +11304,12 @@ let
     stdenv = overrideGCC stdenv gcc49;
   };
 
+  girara-light = callPackage ../applications/misc/girara {
+    gtk = gtk3;
+    withBuildColors = false;
+    ncurses = null;
+  };
+
   zgrviewer = callPackage ../applications/graphics/zgrviewer {};
 
   zim = callPackage ../applications/office/zim {