diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2018-03-27 21:35:12 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2018-04-12 01:18:41 +0200 |
| commit | 9a57536633c4adccaa23606263d6e5795a421b21 (patch) | |
| tree | a1dce43dc948236841f101e2f5599fd4edcc2ba5 /pkgs | |
| parent | 6b723642893fe946567db2df5a8b434514547486 (diff) | |
| download | nixpkgs-9a57536633c4adccaa23606263d6e5795a421b21.tar nixpkgs-9a57536633c4adccaa23606263d6e5795a421b21.tar.gz nixpkgs-9a57536633c4adccaa23606263d6e5795a421b21.tar.bz2 nixpkgs-9a57536633c4adccaa23606263d6e5795a421b21.tar.lz nixpkgs-9a57536633c4adccaa23606263d6e5795a421b21.tar.xz nixpkgs-9a57536633c4adccaa23606263d6e5795a421b21.tar.zst nixpkgs-9a57536633c4adccaa23606263d6e5795a421b21.zip | |
girara: 0.2.8 → 0.2.9
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/misc/girara/default.nix | 28 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
2 files changed, 7 insertions, 27 deletions
diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix index 184ab818b1c..ab4159790de 100644 --- a/pkgs/applications/misc/girara/default.nix +++ b/pkgs/applications/misc/girara/default.nix @@ -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/; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a16b2e5d58c..61675b8f974 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; |