diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-09-15 13:18:54 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-09-15 13:18:54 +0200 |
| commit | b6c6e1f9e8f72ad7caf3b7daec327f77a16ffba1 (patch) | |
| tree | 1665938bf023545db2afcf42d924a47d7f2918b2 /doc | |
| parent | 9f8a7d26798ced69f3185a59383bbb3db6b06bde (diff) | |
| parent | c860babfe6a512aa7c7e83751547347a137ecd67 (diff) | |
Merge branch 'master' into staging-next
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/package-specific-user-notes.xml | 6 | ||||
| -rw-r--r-- | doc/stdenv.xml | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/package-specific-user-notes.xml b/doc/package-specific-user-notes.xml index a176f4d1395..ef23b022c88 100644 --- a/doc/package-specific-user-notes.xml +++ b/doc/package-specific-user-notes.xml @@ -416,7 +416,7 @@ overrides = self: super: rec { <para> Please note that the <literal>citrix_receiver</literal> package has been deprecated since its development was <link xlink:href="https://docs.citrix.com/en-us/citrix-workspace-app.html">discontinued by upstream</link> - and will be replaced by <link xlink:href="https://www.citrix.com/products/workspace-app/">the citrix workspace app</link>. + and has been replaced by <link xlink:href="https://www.citrix.com/products/workspace-app/">the citrix workspace app</link>. </para> </note> <link xlink:href="https://www.citrix.com/products/receiver/">Citrix Receiver</link> and @@ -458,7 +458,7 @@ overrides = self: super: rec { <title>Custom certificates</title> <para> - The <literal>Citrix Receiver</literal> and <literal>Citrix Workspace App</literal> + The <literal>Citrix Workspace App</literal> in <literal>nixpkgs</literal> trust several certificates <link xlink:href="https://curl.haxx.se/docs/caextract.html">from the Mozilla database</link> by default. However several companies using Citrix @@ -472,7 +472,7 @@ overrides = self: super: rec { <programlisting> <![CDATA[with import <nixpkgs> { config.allowUnfree = true; }; let extraCerts = [ ./custom-cert-1.pem ./custom-cert-2.pem /* ... */ ]; in -citrix_workspace.override { # the same applies for `citrix_receiver` if used. +citrix_workspace.override { inherit extraCerts; }]]> </programlisting> diff --git a/doc/stdenv.xml b/doc/stdenv.xml index 16003fb4acf..f8c2aff9785 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -2411,7 +2411,7 @@ addEnvHooks "$hostOffset" myBashFunction <para> The Bintools Wrapper was only just recently split off from CC Wrapper, so the division of labor is still being worked out. For example, it - shouldn't care about about the C standard library, but just take a + shouldn't care about the C standard library, but just take a derivation with the dynamic loader (which happens to be the glibc on linux). Dependency finding however is a task both wrappers will continue to need to share, and probably the most important to understand. It is |