Merge remote-tracking branch 'origin/master' into aur-fix

README.md

@@ -255,6 +255,18 @@ brew install ffsend
 ffsend --help
 ```
 
+#### macOS: Nix package
+_Note: The Nix package is currently not automatically updated, therefore it
+might be slightly outdated. Open an issue if you believe an important update
+is missing._
+
+```bash
+nix-channel --update
+nix-env --install ffsend
+
+ffsend --help
+```
+
 #### macOS: Prebuilt binaries
 Check out the [latest release][github-latest-release] assets for a macOS binary.
 If it isn't available yet, you may use an artifact from a

appveyor.yml

@@ -73,8 +73,7 @@ build_script:
   - cd ..\..\..\
 
   # Create the release, upload the binaries
-  # TODO: fix errors caused by the command below
-  # - ps: '$ErrorActionPreference = "SilentlyContinue"; .\github-release.exe release --token $env:GITHUB_TOKEN --owner timvisee --repo ffsend --tag $env:APPVEYOR_REPO_TAG_NAME --title "ffsend $env:APPVEYOR_REPO_TAG_NAME"; exit 0'
+  - ps: Invoke-Expression -Command '$ErrorActionPreference = "SilentlyContinue"; .\github-release.exe release --token $env:GITHUB_TOKEN --owner timvisee --repo ffsend --tag $env:APPVEYOR_REPO_TAG_NAME --title "ffsend $env:APPVEYOR_REPO_TAG_NAME"; exit 0'
   - ps: .\github-release.exe upload --token $env:GITHUB_TOKEN --owner timvisee --repo ffsend --tag $env:APPVEYOR_REPO_TAG_NAME --file .\ffsend-$env:TARGET.exe --name ffsend-$env:APPVEYOR_REPO_TAG_NAME-windows-x64.exe
   - ps: .\github-release.exe upload --token $env:GITHUB_TOKEN --owner timvisee --repo ffsend --tag $env:APPVEYOR_REPO_TAG_NAME --file .\ffsend-$env:TARGET-static.exe --name ffsend-$env:APPVEYOR_REPO_TAG_NAME-windows-x64-static.exe
   - ps: .\github-release.exe upload --token $env:GITHUB_TOKEN --owner timvisee --repo ffsend --tag $env:APPVEYOR_REPO_TAG_NAME --file (Get-Item .\ffsend.*.nupkg).FullName --name ffsend-$env:APPVEYOR_REPO_TAG_NAME.nupkg

build.rs

@@ -1,6 +1,6 @@
 fn main() {
     // xclip and xsel paths are inserted at compile time on Linux
-    #[cfg(target_os = "linux")]
+    #[cfg(all(feature = "clipboard", target_os = "linux"))]
     {
         println!("cargo:rerun-if-env-changed=XCLIP_PATH");
         println!("cargo:rerun-if-env-changed=XSEL_PATH");

src/util.rs

@@ -352,7 +352,7 @@ impl ClipboardType {
         }
     }
 
-    /// Set clipboar contents through the selected clipboard type.
+    /// Set clipboard contents through the selected clipboard type.
     pub fn set(&self, content: String) -> Result<(), ClipboardError> {
         match self {
             #[cfg(not(target_os = "linux"))]