pan: wrap to provide gpg2, which it crashes without

Fixes #37556.
This commit is contained in:
Will Dietz 2018-03-21 07:44:40 -05:00
parent 8265979114
commit 96f0d4e98c

View file

@ -1,6 +1,7 @@
{ spellChecking ? true { spellChecking ? true
, stdenv, fetchurl, pkgconfig, gtk2, gtkspell2 ? null , stdenv, fetchurl, pkgconfig, gtk2, gtkspell2 ? null
, perl, pcre, gmime, gettext, intltool, itstool, libxml2, dbus-glib, libnotify , perl, pcre, gmime, gettext, intltool, itstool, libxml2, dbus-glib, libnotify
, makeWrapper, gnupg
}: }:
assert spellChecking -> gtkspell2 != null; assert spellChecking -> gtkspell2 != null;
@ -15,10 +16,14 @@ stdenv.mkDerivation {
sha256 = "0l07y75z8jxhbmfv28slw81gjncs7i89x7fq44zif7xhq5vy7yli"; sha256 = "0l07y75z8jxhbmfv28slw81gjncs7i89x7fq44zif7xhq5vy7yli";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig makeWrapper ];
buildInputs = [ gtk2 perl gmime gettext intltool itstool libxml2 dbus-glib libnotify ] buildInputs = [ gtk2 perl gmime gettext gnupg intltool itstool libxml2 dbus-glib libnotify ]
++ stdenv.lib.optional spellChecking gtkspell2; ++ stdenv.lib.optional spellChecking gtkspell2;
postInstall = ''
wrapProgram $out/bin/pan --suffix PATH : ${gnupg}/bin
'';
enableParallelBuilding = true; enableParallelBuilding = true;
meta = { meta = {