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

mu: fix build of webkit support and re-enable it

Browse Source
This commit is contained in:
Gabriel Ebner 2016-07-11 10:36:13 +02:00
parent 85a895d60f
commit ad41b8fa19
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/tools/networking/mu/default.nix
View File

@ -1,6 +1,6 @@
{ fetchurl, stdenv, sqlite, pkgconfig, autoreconfHook { fetchurl, stdenv, sqlite, pkgconfig, autoreconfHook
, xapian, glib, gmime, texinfo , emacs, guile , xapian, glib, gmime, texinfo , emacs, guile
, gtk3, webkit, libsoup, icu, withMug ? false /* doesn't build with current gtk3 */ }: , gtk3, webkitgtk24x, libsoup, icu }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.9.16"; version = "0.9.16";
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
sqlite pkgconfig xapian glib gmime texinfo emacs guile libsoup icu sqlite pkgconfig xapian glib gmime texinfo emacs guile libsoup icu
autoreconfHook autoreconfHook
] ++ stdenv.lib.optionals withMug [ gtk3 webkit ]; gtk3 webkitgtk24x ];
preBuild = '' preBuild = ''
# Fix mu4e-builddir (set it to $out) # Fix mu4e-builddir (set it to $out)
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
''; '';
# Install mug and msg2pdf # Install mug and msg2pdf
postInstall = stdenv.lib.optionalString withMug '' postInstall = ''
cp -v toys/msg2pdf/msg2pdf $out/bin/ cp -v toys/msg2pdf/msg2pdf $out/bin/
cp -v toys/mug/mug $out/bin/ cp -v toys/mug/mug $out/bin/
''; '';