girara: 0.2.8 → 0.2.9

This commit is contained in:
Jan Tojnar 2018-03-27 21:35:12 +02:00
parent 6b72364289
commit 9a57536633
No known key found for this signature in database
GPG key ID: 7FAB2A15F7A607A4
2 changed files with 7 additions and 27 deletions

View file

@ -1,32 +1,18 @@
{ stdenv, fetchurl, pkgconfig, gtk, gettext, ncurses, libiconv, libintl
, withBuildColors ? true
{ stdenv, fetchurl, meson, ninja, pkgconfig, glib, gtk, gettext, libiconv, libintl
}:
assert withBuildColors -> ncurses != null;
stdenv.mkDerivation rec {
name = "girara-${version}";
version = "0.2.8";
version = "0.2.9";
src = fetchurl {
url = "http://pwmt.org/projects/girara/download/${name}.tar.gz";
sha256 = "18wss3sak3djip090v2vdbvq1mvkwcspfswc87zbvv3magihan98";
url = "http://pwmt.org/projects/girara/download/${name}.tar.xz";
sha256 = "0lkxrfna818wkkr2f6mdzf15y5z8xl1b9592ylmzjbqsqya3w7x8";
};
preConfigure = ''
substituteInPlace colors.mk \
--replace 'ifdef TPUT_AVAILABLE' 'ifneq ($(TPUT_AVAILABLE), 0)'
'';
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gtk gettext libintl libiconv ];
makeFlags = [
"PREFIX=$(out)"
(if withBuildColors
then "TPUT=${ncurses.out}/bin/tput"
else "TPUT_AVAILABLE=0")
];
nativeBuildInputs = [ meson ninja pkgconfig gettext ];
buildInputs = [ libintl libiconv ];
propagatedBuildInputs = [ glib gtk ];
meta = with stdenv.lib; {
homepage = https://pwmt.org/projects/girara/;

View file

@ -15873,12 +15873,6 @@ with pkgs;
gtk = gtk3;
};
girara-light = callPackage ../applications/misc/girara {
gtk = gtk3;
withBuildColors = false;
ncurses = null;
};
gitAndTools = recurseIntoAttrs (callPackage ../applications/version-management/git-and-tools {});
inherit (gitAndTools) git gitFull gitSVN git-cola svn2git git-radar git-secret transcrypt git-crypt;