public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

girara: 0.2.8 → 0.2.9

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pkgs/applications/misc/girara/default.nix
View File

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

6
pkgs/top-level/all-packages.nix
View File

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