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

newsbeuter: Update from 2.7 to 2.8

Browse Source
This commit is contained in:
Ben Doyle 2014-03-13 13:15:28 -04:00
parent d6349df0dd
commit 8fb68289c6
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/applications/networking/feedreaders/newsbeuter/default.nix
View File

@ -1,23 +1,24 @@
{ stdenv, fetchurl, sqlite, curl, pkgconfig, libxml2, stfl, json_c, ncurses { stdenv, fetchurl, sqlite, curl, pkgconfig, libxml2, stfl, json-c-0-11, ncurses
, gettext, libiconvOrEmpty, makeWrapper, perl }: , gettext, libiconvOrEmpty, makeWrapper, perl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "newsbeuter-2.7"; name = "newsbeuter-2.8";
src = fetchurl { src = fetchurl {
url = "http://www.newsbeuter.org/downloads/${name}.tar.gz"; url = "http://www.newsbeuter.org/downloads/${name}.tar.gz";
sha256 = "0flhzzlbdirjmrq738gmcxqqnifg3kb7plcwqcxshpizmjkhswp6"; sha256 = "013qi8yghpms2qq1b3xbrlmfgpj0ybgk0qhj245ni4kpxila0wn8";
}; };
buildInputs buildInputs
# use gettext instead of libintlOrEmpty so we have access to the msgfmt # use gettext instead of libintlOrEmpty so we have access to the msgfmt
# command # command
= [ pkgconfig sqlite curl libxml2 stfl json_c ncurses gettext perl ] = [ pkgconfig sqlite curl libxml2 stfl json-c-0-11 ncurses gettext perl ]
++ libiconvOrEmpty ++ libiconvOrEmpty
++ stdenv.lib.optional stdenv.isDarwin makeWrapper; ++ stdenv.lib.optional stdenv.isDarwin makeWrapper;
preBuild = '' preBuild = ''
sed -i -e 104,108d config.sh sed -i -e 110,114d config.sh
sed -i "1 s%^.*$%#!${perl}/bin/perl%" txt2h.pl sed -i "1 s%^.*$%#!${perl}/bin/perl%" txt2h.pl
export LDFLAGS=-lncursesw export LDFLAGS=-lncursesw
''; '';

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

@ -10512,7 +10512,7 @@ let
desktopName = "Vimb"; desktopName = "Vimb";
}; };
VisualBoyAdvance = callPackage ../misc/emulators/VisualBoyAdvance { }; # VisualBoyAdvance = callPackage ../misc/emulators/VisualBoyAdvance { };
# Wine cannot be built in 64-bit; use a 32-bit build instead. # Wine cannot be built in 64-bit; use a 32-bit build instead.
wineStable = callPackage_i686 ../misc/emulators/wine/stable.nix { wineStable = callPackage_i686 ../misc/emulators/wine/stable.nix {