diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-12-10 00:43:20 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-10 00:43:20 +0000 |
| commit | 48e49d01b6d3c3ecc30e44b4db7fb03197f7e932 (patch) | |
| tree | f28253f05196dea256f65ce6af0497699a103af0 | |
| parent | de02111a517377124c9a3104fe8a85bb28ea2888 (diff) | |
| parent | 14087abe6a4a38fbd9c1a8865ce6c5ff0211e22b (diff) | |
| download | nixlib-48e49d01b6d3c3ecc30e44b4db7fb03197f7e932.tar nixlib-48e49d01b6d3c3ecc30e44b4db7fb03197f7e932.tar.gz nixlib-48e49d01b6d3c3ecc30e44b4db7fb03197f7e932.tar.bz2 nixlib-48e49d01b6d3c3ecc30e44b4db7fb03197f7e932.tar.lz nixlib-48e49d01b6d3c3ecc30e44b4db7fb03197f7e932.tar.xz nixlib-48e49d01b6d3c3ecc30e44b4db7fb03197f7e932.tar.zst nixlib-48e49d01b6d3c3ecc30e44b4db7fb03197f7e932.zip | |
Merge pull request #51781 from Mic92/openssl-11-docs
openssl_1_1: Add "doc" output to contain HTML documentation
| -rw-r--r-- | pkgs/development/libraries/openssl/default.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 5fd7e14f2bdb..32fd6e727f7d 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -7,7 +7,7 @@ with stdenv.lib; let - common = args@{ version, sha256, patches ? [] }: stdenv.mkDerivation rec { + common = args@{ version, sha256, patches ? [], withDocs ? false }: stdenv.mkDerivation rec { name = "openssl-${version}"; src = fetchurl { @@ -33,7 +33,7 @@ let '!defined(__ANDROID__) && !defined(__OpenBSD__) && 0' ''; - outputs = [ "bin" "dev" "out" "man" ]; + outputs = [ "bin" "dev" "out" "man" ] ++ optional withDocs "doc"; setOutputFlags = false; separateDebugInfo = stdenv.hostPlatform.isLinux; @@ -135,6 +135,7 @@ in { version = "1.1.1a"; sha256 = "0hcz7znzznbibpy3iyyhvlqrq44y88plxwdj32wjzgbwic7i687w"; patches = [ ./1.1/nix-ssl-cert-file.patch ]; + withDocs = true; }; } |