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

This commit is contained in:
koral 2014-11-23 23:37:53 +01:00
parent 444bda1936
commit 222366883d
2 changed files with 23 additions and 10 deletions

View File

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

View File

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