diff options
| author | Alyssa Ross <hi@alyssa.is> | 2020-01-26 23:38:55 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-01-26 23:38:55 +0000 |
| commit | 02e12559a420f8c544b2facc4931904900a05518 (patch) | |
| tree | ba39d8fa9e874b935d204e74accfed5caaccf0fa /nixpkgs/doc | |
| parent | 542f80867c380b0ac79250b6e5358dda8bc49e0d (diff) | |
| parent | 3d085a399c436a41d875801619e8f976b8519196 (diff) | |
| download | nixlib-02e12559a420f8c544b2facc4931904900a05518.tar nixlib-02e12559a420f8c544b2facc4931904900a05518.tar.gz nixlib-02e12559a420f8c544b2facc4931904900a05518.tar.bz2 nixlib-02e12559a420f8c544b2facc4931904900a05518.tar.lz nixlib-02e12559a420f8c544b2facc4931904900a05518.tar.xz nixlib-02e12559a420f8c544b2facc4931904900a05518.tar.zst nixlib-02e12559a420f8c544b2facc4931904900a05518.zip | |
Merge commit '3d085a399c436a41d875801619e8f976b8519196'
Diffstat (limited to 'nixpkgs/doc')
| -rw-r--r-- | nixpkgs/doc/builders/images/appimagetools.xml | 2 | ||||
| -rw-r--r-- | nixpkgs/doc/languages-frameworks/rust.section.md | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/nixpkgs/doc/builders/images/appimagetools.xml b/nixpkgs/doc/builders/images/appimagetools.xml index 37e4251cda2e..0767a509a43d 100644 --- a/nixpkgs/doc/builders/images/appimagetools.xml +++ b/nixpkgs/doc/builders/images/appimagetools.xml @@ -80,7 +80,7 @@ appimageTools.wrapType2 { # or wrapType1 <varname>src</varname> specifies the AppImage file to extract. </para> </callout> - <callout arearefs='ex-appimageTools-wrapping-2'> + <callout arearefs='ex-appimageTools-wrapping-3'> <para> <varname>extraPkgs</varname> allows you to pass a function to include additional packages inside the FHS environment your AppImage is going to run in. There are a few ways to learn which dependencies an application needs: <itemizedlist> diff --git a/nixpkgs/doc/languages-frameworks/rust.section.md b/nixpkgs/doc/languages-frameworks/rust.section.md index 0edf03ad26a9..3332dff1eb07 100644 --- a/nixpkgs/doc/languages-frameworks/rust.section.md +++ b/nixpkgs/doc/languages-frameworks/rust.section.md @@ -16,12 +16,6 @@ cargo into the `environment.systemPackages` or bring them into scope with `nix-shell -p rustc cargo`. -> If you are using NixOS and you want to use rust without a nix expression you -> probably want to add the following in your `configuration.nix` to build -> crates with C dependencies. -> -> environment.systemPackages = [binutils gcc gnumake openssl pkgconfig] - For daily builds (beta and nightly) use either rustup from nixpkgs or use the [Rust nightlies overlay](#using-the-rust-nightlies-overlay). |