diff options
| author | Renaud <c0bw3b@users.noreply.github.com> | 2019-12-20 23:31:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-20 23:31:28 +0100 |
| commit | 60820d8d83e50dff9291ac2d7ee08f4bfb1c042a (patch) | |
| tree | cf45e143dd99e6d5c6af3951eaae0dd4b498da61 /pkgs | |
| parent | 6bfe79351bdaec69bdcda01f4ebc693cf4eb10f5 (diff) | |
| parent | 9de076f45c9ebb4766bd9fd8cff39d73aaa32db0 (diff) | |
| download | nixlib-60820d8d83e50dff9291ac2d7ee08f4bfb1c042a.tar nixlib-60820d8d83e50dff9291ac2d7ee08f4bfb1c042a.tar.gz nixlib-60820d8d83e50dff9291ac2d7ee08f4bfb1c042a.tar.bz2 nixlib-60820d8d83e50dff9291ac2d7ee08f4bfb1c042a.tar.lz nixlib-60820d8d83e50dff9291ac2d7ee08f4bfb1c042a.tar.xz nixlib-60820d8d83e50dff9291ac2d7ee08f4bfb1c042a.tar.zst nixlib-60820d8d83e50dff9291ac2d7ee08f4bfb1c042a.zip | |
Merge pull request #75648 from jorsn/tintin.add-ssl
tintin: added ssl support via gnutls
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/games/tintin/default.nix | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/games/tintin/default.nix b/pkgs/games/tintin/default.nix index dc696d055580..9b58725a3927 100644 --- a/pkgs/games/tintin/default.nix +++ b/pkgs/games/tintin/default.nix @@ -1,4 +1,9 @@ -{ stdenv, fetchurl, zlib, pcre }: +{ stdenv, fetchurl, lib, zlib, pcre +, tlsSupport ? true, gnutls ? null +# ^ set { tlsSupport = false; } to reduce closure size by ~= 18.6 MB +}: + +assert tlsSupport -> gnutls != null; stdenv.mkDerivation rec { name = "tintin-2.01.92"; @@ -8,7 +13,8 @@ stdenv.mkDerivation rec { sha256 = "0id8rd2yhh6ccjnlwyixflsay1rq3sw6pwlhz1ic3nzj22cd91ik"; }; - buildInputs = [ zlib pcre ]; + nativeBuildInputs = lib.optional tlsSupport gnutls.dev; + buildInputs = [ zlib pcre ] ++ lib.optional tlsSupport gnutls; preConfigure = '' cd src |