Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: eae0eb089206
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e2b638df5ff4
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Sep 8, 2019

  1. ffsend: adopt installShellFiles

    @lilyball
    lilyball committed Sep 8, 2019
    Copy the full SHA
    ed62060 View commit details

Commits on Sep 9, 2019

  1. Merge pull request #68330 from lilyball/ffsend-installShellFiles 

    ffsend: adopt installShellFiles
    @worldofpeace
    worldofpeace authored Sep 9, 2019
    Copy the full SHA
    e2b638d View commit details
Showing with 3 additions and 5 deletions.
  1. +3 −5 pkgs/tools/misc/ffsend/default.nix
8 changes: 3 additions & 5 deletions pkgs/tools/misc/ffsend/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitLab, rustPlatform, cmake, pkgconfig, openssl
, darwin
, darwin, installShellFiles

, x11Support ? stdenv.isLinux || stdenv.hostPlatform.isBSD
, xclip ? null, xsel ? null
@@ -27,7 +27,7 @@ buildRustPackage rec {

cargoSha256 = "1x4hxar60lwimldpsi0frdlssgsb72qahn3dmb980sj6cmbq3f0b";

nativeBuildInputs = [ cmake pkgconfig ];
nativeBuildInputs = [ cmake pkgconfig installShellFiles ];
buildInputs = [ openssl ]
++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation CoreServices Security AppKit ])
;
@@ -41,9 +41,7 @@ buildRustPackage rec {
);

postInstall = ''
install -Dm644 contrib/completions/_ffsend "$out/share/zsh/site-functions/_ffsend"
install -Dm644 contrib/completions/ffsend.bash "$out/share/bash-completion/completions/ffsend.bash"
install -Dm644 contrib/completions/ffsend.fish "$out/share/fish/vendor_completions.d/ffsend.fish"
installShellCompletion contrib/completions/ffsend.{bash,fish} --zsh contrib/completions/_ffsend
'';
# There's also .elv and .ps1 completion files but I don't know where to install those