diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-01-26 18:06:19 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-01-26 18:21:18 +0000 |
commit | 7ac6743433dd45ceaead2ca96f6356dc0d064ce6 (patch) | |
tree | b68ec89d7d2a8d2b6e6b1ff94ba26d6af4096350 /nixpkgs/pkgs/development/libraries/nghttp2 | |
parent | c5c7451dbef37b51f52792d6395a670ef5183d27 (diff) | |
parent | 891f607d5301d6730cb1f9dcf3618bcb1ab7f10e (diff) | |
download | nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.gz nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.bz2 nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.lz nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.xz nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.zst nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.zip |
Merge commit '891f607d5301d6730cb1f9dcf3618bcb1ab7f10e'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/nghttp2')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/nghttp2/default.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/development/libraries/nghttp2/default.nix b/nixpkgs/pkgs/development/libraries/nghttp2/default.nix index c9ccf63f8895..6464679b9489 100644 --- a/nixpkgs/pkgs/development/libraries/nghttp2/default.nix +++ b/nixpkgs/pkgs/development/libraries/nghttp2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config # Optional Dependencies , openssl ? null, zlib ? null @@ -8,7 +8,7 @@ , enableAsioLib ? false, boost ? null , enableGetAssets ? false, libxml2 ? null , enableJemalloc ? false, jemalloc ? null -, enableApp ? !stdenv.hostPlatform.isWindows +, enableApp ? with stdenv.hostPlatform; !isWindows && !isStatic , enablePython ? false, python ? null, cython ? null, ncurses ? null, setuptools ? null }: @@ -23,7 +23,7 @@ assert enableGetAssets -> libxml2 != null; assert enableJemalloc -> jemalloc != null; assert enablePython -> python != null && cython != null && ncurses != null && setuptools != null; -let inherit (stdenv.lib) optional optionals optionalString; in +let inherit (lib) optional optionals optionalString; in stdenv.mkDerivation rec { pname = "nghttp2"; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "out" "dev" "lib" ] ++ optional enablePython "python"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ optional enableLibEv libev ++ [ zlib ] @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-spdylay=no" "--disable-examples" - (stdenv.lib.enableFeature enableApp "app") + (lib.enableFeature enableApp "app") ] ++ optional enableAsioLib "--enable-asio-lib --with-boost-libdir=${boost}/lib" ++ (if enablePython then [ "--with-cython=${cython}/bin/cython" @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { #doCheck = true; # requires CUnit ; currently failing at test_util_localtime_date in util_test.cc - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://nghttp2.org/"; description = "A C implementation of HTTP/2"; license = licenses.mit; |