Merge branch 'master' of github.com:nixos/nixpkgs into add_pkg_gorilla

2016-12-29 14:02:52 +01:00
parent 004eceb0f6 774435d0aa
commit 87ef766f6b
24 changed files with 482 additions and 308 deletions
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, pkgconfig, libgcrypt, libassuan, libksba, libiconv, npth
-, gettext, texinfo, pcsclite
+, gettext, texinfo, pcsclite, sqlite

 # Each of the dependencies below are optional.
 # Gnupg can be built without them at the cost of reduced functionality.
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {

  buildInputs = [
    pkgconfig libgcrypt libassuan libksba libiconv npth gettext texinfo
-    readline libusb gnutls adns openldap zlib bzip2
+    readline libusb gnutls adns openldap zlib bzip2 sqlite
  ];

  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";