diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-04-09 18:28:16 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-04-12 18:46:15 +0000 |
| commit | fd2e737e0678ee7d8081baef05b305146a2c0034 (patch) | |
| tree | ac3e9b27576a0382335532d126f9a66d486bc638 /nixpkgs/pkgs/development/libraries/libwebsockets | |
| parent | cc207d720b6aa836e256c1ee9842bc739e630a8a (diff) | |
| parent | 9e377a6ce42dccd9b624ae4ce8f978dc892ba0e2 (diff) | |
| download | nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.gz nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.bz2 nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.lz nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.xz nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.zst nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.zip | |
Merge remote-tracking branch 'nixpkgs/nixos-unstable'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libwebsockets')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libwebsockets/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libwebsockets/default.nix b/nixpkgs/pkgs/development/libraries/libwebsockets/default.nix index 33c1cecfbc81..c62aa77c61a9 100644 --- a/nixpkgs/pkgs/development/libraries/libwebsockets/default.nix +++ b/nixpkgs/pkgs/development/libraries/libwebsockets/default.nix @@ -20,7 +20,7 @@ let "-DLWS_WITH_PLUGINS=ON" "-DLWS_WITH_IPV6=ON" "-DLWS_WITH_SOCKS5=ON" - ]; + ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-DLWS_WITHOUT_TESTAPPS=ON"; NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=unused-but-set-variable"; @@ -35,6 +35,7 @@ let # Relicensed from LGPLv2.1+ to MIT with 4.0. Licensing situation # is tricky, see https://github.com/warmcat/libwebsockets/blob/main/LICENSE license = with licenses; [ mit publicDomain bsd3 asl20 ]; + maintainers = with maintainers; [ mindavi ]; platforms = platforms.all; }; }; |