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

Merge pull request #37561 from dtzWill/fix/pan-and-update

Browse Source 
pan: update 0.139 -> 0.144, fix crash on startup, dep and feature wrangling.
This commit is contained in:
Will Dietz 2018-03-21 11:56:53 -05:00 committed by GitHub
commit c932a74b4a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
pkgs/applications/networking/newsreaders/pan/default.nix
View File

@ -1,23 +1,38 @@
{ spellChecking ? true { spellChecking ? true
, stdenv, fetchurl, pkgconfig, gtk2, gtkspell2 ? null , stdenv, fetchurl, pkgconfig, gtk3, gtkspell3 ? null
, perl, pcre, gmime, gettext, intltool, dbus-glib, libnotify , perl, pcre, gmime2, gettext, intltool, itstool, libxml2, dbus-glib, libnotify, gnutls
, makeWrapper, gnupg
, gnomeSupport ? true, libgnome-keyring3
}: }:
assert spellChecking -> gtkspell2 != null; assert spellChecking -> gtkspell3 != null;
let version = "0.139"; in let version = "0.144"; in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "pan-${version}"; name = "pan-${version}";
src = fetchurl { src = fetchurl {
url = "http://pan.rebelbase.com/download/releases/${version}/source/pan-${version}.tar.bz2"; url = "http://pan.rebelbase.com/download/releases/${version}/source/pan-${version}.tar.bz2";
sha256 = "1fab2i6ngqp66lhls0g7j8d1c1rk75afiqr3r1x2sn3zk47k4pxz"; sha256 = "0l07y75z8jxhbmfv28slw81gjncs7i89x7fq44zif7xhq5vy7yli";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig makeWrapper ];
buildInputs = [ gtk2 perl gmime gettext intltool dbus-glib libnotify ] buildInputs = [ gtk3 perl gmime2 gettext intltool itstool libxml2 dbus-glib libnotify gnutls ]
++ stdenv.lib.optional spellChecking gtkspell2; ++ stdenv.lib.optional spellChecking gtkspell3
++ stdenv.lib.optional gnomeSupport libgnome-keyring3;
configureFlags = [
"--with-dbus"
"--with-gtk3"
"--with-gnutls"
"--enable-libnotify"
] ++ stdenv.lib.optional spellChecking "--with-gtkspell"
++ stdenv.lib.optional gnomeSupport "--enable-gkr";
postInstall = ''
wrapProgram $out/bin/pan --suffix PATH : ${gnupg}/bin
'';
enableParallelBuilding = true; enableParallelBuilding = true;

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

@ -17023,9 +17023,7 @@ with pkgs;
ncpamixer = callPackage ../applications/audio/ncpamixer { }; ncpamixer = callPackage ../applications/audio/ncpamixer { };
pan = callPackage ../applications/networking/newsreaders/pan { pan = callPackage ../applications/networking/newsreaders/pan { };
spellChecking = false;
};
panotools = callPackage ../applications/graphics/panotools { }; panotools = callPackage ../applications/graphics/panotools { };