From 3c013cdec98a29302e10a0a9f0f79a1991dfbe2b Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Tue, 10 Dec 2013 21:27:47 +0100 Subject: mu: fix build via disabling mug GUI by default It seems it can't handle gtk-3.10. CC @the-kenny --- pkgs/tools/networking/mu/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'pkgs/tools/networking/mu') diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index e42dfee7cae..f959ad1d573 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, sqlite, pkgconfig, xapian, glib, gmime, texinfo, emacs, guile -, gtk3, webkit, libsoup, icu }: +, gtk3, webkit, libsoup, icu, withMug ? false /* doesn't build with current gtk3 */ }: stdenv.mkDerivation rec { version = "0.9.9.5"; @@ -10,8 +10,9 @@ stdenv.mkDerivation rec { sha256 = "1hwkliyb8fjrz5sw9fcisssig0jkdxzhccw0ld0l9a10q1l9mqhp"; }; - buildInputs = [ sqlite pkgconfig xapian glib gmime texinfo emacs guile - gtk3 webkit libsoup icu ]; + buildInputs = + [ sqlite pkgconfig xapian glib gmime texinfo emacs guile libsoup icu ] + ++ stdenv.lib.optional withMug [ gtk3 webkit ]; preBuild = '' # Fix mu4e-builddir (set it to $out) @@ -24,7 +25,7 @@ stdenv.mkDerivation rec { ''; # Install mug and msg2pdf - postInstall = '' + postInstall = stdenv.lib.optionalString withMug '' cp -v toys/msg2pdf/msg2pdf $out/bin/ cp -v toys/mug/mug $out/bin/ ''; -- cgit 1.4.1