diff options
| author | Luca Bruno <lethalman88@gmail.com> | 2015-12-11 18:31:00 +0100 |
|---|---|---|
| committer | Luca Bruno <lethalman88@gmail.com> | 2015-12-11 18:31:00 +0100 |
| commit | 5b0352a6a43fdd924a53cde4b81c15b755fa0a27 (patch) | |
| tree | cf0fcc2be2f6d08c970f0322a63ff0a31d5d5dee /pkgs/tools/networking/haproxy/default.nix | |
| parent | 2f0fe05543ce594eacf0310966914d6e19a42f88 (diff) | |
| parent | 146784f835a6cadc65812c5adf76533c18e5be61 (diff) | |
| download | nixlib-5b0352a6a43fdd924a53cde4b81c15b755fa0a27.tar nixlib-5b0352a6a43fdd924a53cde4b81c15b755fa0a27.tar.gz nixlib-5b0352a6a43fdd924a53cde4b81c15b755fa0a27.tar.bz2 nixlib-5b0352a6a43fdd924a53cde4b81c15b755fa0a27.tar.lz nixlib-5b0352a6a43fdd924a53cde4b81c15b755fa0a27.tar.xz nixlib-5b0352a6a43fdd924a53cde4b81c15b755fa0a27.tar.zst nixlib-5b0352a6a43fdd924a53cde4b81c15b755fa0a27.zip | |
Merge branch 'master' into closure-size
Diffstat (limited to 'pkgs/tools/networking/haproxy/default.nix')
| -rw-r--r-- | pkgs/tools/networking/haproxy/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index de8488ab3a8e..f6201b44b3ea 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, fetchurl, openssl }: +{ stdenv, pkgs, fetchurl, openssl, zlib }: stdenv.mkDerivation rec { majorVersion = "1.5"; @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { sha256 = "16cg1jmy2d8mq2ypwifsvhbyp4pyrj0zm0r818sx0r4hchwdsrcm"; }; - buildInputs = [ openssl ]; + buildInputs = [ openssl zlib ]; # TODO: make it work on darwin/bsd as well preConfigure = '' - export makeFlags="TARGET=linux2628 PREFIX=$out USE_OPENSSL=yes" + export makeFlags="TARGET=${if stdenv.isSunOS then "solaris" else "linux2628"} PREFIX=$out USE_OPENSSL=yes USE_ZLIB=yes" ''; meta = { |