From 8ca70e358d8836c66153e85db2aee4a0fd44fd21 Mon Sep 17 00:00:00 2001 From: Anthony Cowley Date: Wed, 4 Jan 2017 16:25:59 -0500 Subject: [PATCH] mu: allow gtk-free builds The gtk components are enabled by default when stdenv.isLinux is true. --- pkgs/tools/networking/mu/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index 0cd3e15e7621..c82588559dfc 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -1,6 +1,7 @@ { fetchurl, stdenv, sqlite, pkgconfig, autoreconfHook , xapian, glib, gmime, texinfo , emacs, guile -, gtk3, webkitgtk24x, libsoup, icu }: +, gtk3, webkitgtk24x, libsoup, icu +, withMug ? stdenv.isLinux }: stdenv.mkDerivation rec { version = "0.9.18"; @@ -13,8 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ sqlite pkgconfig xapian glib gmime texinfo emacs guile libsoup icu - autoreconfHook - gtk3 webkitgtk24x ]; + autoreconfHook ] ++ stdenv.lib.optionals withMug [ gtk3 webkitgtk24x ]; preBuild = '' # Fix mu4e-builddir (set it to $out) @@ -27,7 +27,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/ '';