diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-06-01 20:52:03 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-06-04 14:54:48 +0200 |
commit | 3096d03435bb177af8c4868a8efa637b393f2715 (patch) | |
tree | b5353e40eb18bba0e86b04a176879f3e635f48e7 /pkgs/development/libraries/nghttp2 | |
parent | 4f60156afbb8d61d8d28db8ab594ec9328946d71 (diff) | |
download | nixpkgs-3096d03435bb177af8c4868a8efa637b393f2715.tar nixpkgs-3096d03435bb177af8c4868a8efa637b393f2715.tar.gz nixpkgs-3096d03435bb177af8c4868a8efa637b393f2715.tar.bz2 nixpkgs-3096d03435bb177af8c4868a8efa637b393f2715.tar.lz nixpkgs-3096d03435bb177af8c4868a8efa637b393f2715.tar.xz nixpkgs-3096d03435bb177af8c4868a8efa637b393f2715.tar.zst nixpkgs-3096d03435bb177af8c4868a8efa637b393f2715.zip |
Revert "Refactor mkFlag / shouldUsePkg into the nixpkgs libraries"
This reverts commit 25a148fa196b944b3f134527da87e43d88c066f9.
Diffstat (limited to 'pkgs/development/libraries/nghttp2')
-rw-r--r-- | pkgs/development/libraries/nghttp2/default.nix | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix index d8fd36ecba6..bc8c599a901 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -8,9 +8,16 @@ , prefix ? "" }: -with stdenv; -with stdenv.lib; let + mkFlag = trueStr: falseStr: cond: name: val: + if cond == null then null else + "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}"; + mkEnable = mkFlag "enable-" "disable-"; + mkWith = mkFlag "with-" "without-"; + mkOther = mkFlag "" "" true; + + shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null; + isLib = prefix == "lib"; optOpenssl = if isLib then null else shouldUsePkg openssl; @@ -43,7 +50,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ optJansson optBoost optLibxml2 optJemalloc ] - ++ optionals hasApp [ optOpenssl optLibev optZlib ]; + ++ stdenv.lib.optionals hasApp [ optOpenssl optLibev optZlib ]; configureFlags = [ (mkEnable false "werror" null) @@ -61,7 +68,7 @@ stdenv.mkDerivation rec { (mkWith false "cython" null) ]; - meta = { + meta = with stdenv.lib; { homepage = http://nghttp2.org/; description = "an implementation of HTTP/2 in C"; license = licenses.mit; |