dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

pan: ensure features we provide deps for are used, move to gtk3

Browse Source
This commit is contained in:
Will Dietz 2018-03-21 08:45:47 -05:00
parent 96f0d4e98c
commit 7d873b8fd2
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,10 +1,11 @@
{ spellChecking ? true { spellChecking ? true
, stdenv, fetchurl, pkgconfig, gtk2, gtkspell2 ? null , stdenv, fetchurl, pkgconfig, gtk3, gtkspell3 ? null
, perl, pcre, gmime, gettext, intltool, itstool, libxml2, dbus-glib, libnotify , perl, pcre, gmime2, gettext, intltool, itstool, libxml2, dbus-glib, libnotify, gnutls
, makeWrapper, gnupg , makeWrapper, gnupg
, gnomeSupport ? true, libgnome-keyring3
}: }:
assert spellChecking -> gtkspell2 != null; assert spellChecking -> gtkspell3 != null;
let version = "0.144"; in let version = "0.144"; in
@ -17,8 +18,17 @@ stdenv.mkDerivation {
}; };
nativeBuildInputs = [ pkgconfig makeWrapper ]; nativeBuildInputs = [ pkgconfig makeWrapper ];
buildInputs = [ gtk2 perl gmime gettext gnupg intltool itstool libxml2 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 = '' postInstall = ''
wrapProgram $out/bin/pan --suffix PATH : ${gnupg}/bin wrapProgram $out/bin/pan --suffix PATH : ${gnupg}/bin