From 222366883df167e877719b86a489abd6323ea80d Mon Sep 17 00:00:00 2001 From: koral Date: Sun, 23 Nov 2014 23:37:53 +0100 Subject: [PATCH] girara: provided an alternative installation that doesn't require ncurses or gcc 4.9 --- pkgs/applications/misc/girara/default.nix | 27 ++++++++++++++--------- pkgs/top-level/all-packages.nix | 6 +++++ 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix index 3a7e5da1e737..c7c110a978a5 100644 --- a/pkgs/applications/misc/girara/default.nix +++ b/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 ]; }; } - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c96d5b255ed3..66357ffcd408 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11286,6 +11286,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 {