From f595a7eb58519ec6f3987f37ae5677cf347b81cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Thu, 4 Dec 2014 08:26:53 +0100 Subject: [PATCH] srecord: update 1.63 -> 1.64 libgcrypt was an optional dependency in previous versions too, but in this version the build fails unless libgcrypt is there, or --without-gcrypt is passed to configure. Since libgcrypt only increases the closure size from 131 MiB to 136 MiB, I'm adding it as a dependency. [1]: http://srecord.sourceforge.net/change_log.txt --- pkgs/development/tools/misc/srecord/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/misc/srecord/default.nix b/pkgs/development/tools/misc/srecord/default.nix index e316b4a628e..9d0e2d7430e 100644 --- a/pkgs/development/tools/misc/srecord/default.nix +++ b/pkgs/development/tools/misc/srecord/default.nix @@ -1,14 +1,17 @@ -{ stdenv, fetchurl, boost, libtool, groff, ghostscript }: +{ stdenv, fetchurl, boost, libtool, groff, ghostscript, libgcrypt ? null }: stdenv.mkDerivation rec { - name = "srecord-1.63"; + name = "srecord-1.64"; src = fetchurl { url = "mirror://sourceforge/srecord/${name}.tar.gz"; - sha256 = "06mzj9lrk8lzfzhnfyh8xm4p92j242jik6zm37ihcia20inwgzkq"; + sha256 = "1qk75q0k5vzmm3932q9hqz2gp8n9rrdfjacsswxc02656f3l3929"; }; - buildInputs = [ boost libtool groff ghostscript ]; + buildInputs = [ boost libtool groff ghostscript libgcrypt ]; + + configureFlags = stdenv.lib.optionalString + (libgcrypt == null) "--without-gcrypt"; meta = with stdenv.lib; { description = "Collection of powerful tools for manipulating EPROM load files";