Merge pull request #84062 from abathur/fix/yadm_src_usage

yadm: install from build directory instead of $src
This commit is contained in:
Graham Christensen 2020-12-15 10:39:20 -05:00 committed by GitHub
commit 9612cb9092
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 4 deletions

View file

@ -100,6 +100,12 @@
githubId = 178750;
name = "Andreas Baldeau";
};
abathur = {
email = "travis.a.everett+nixpkgs@gmail.com";
github = "abathur";
githubId = 2548365;
name = "Travis A. Everett";
};
abbe = {
email = "ashish.is@lostca.se";
github = "wahjava";

View file

@ -19,10 +19,10 @@ stdenv.mkDerivation {
installPhase = ''
runHook preInstall
install -Dt $out/bin $src/yadm
install -Dt $out/share/man/man1 $src/yadm.1
install -D $src/completion/yadm.zsh_completion $out/share/zsh/site-functions/_yadm
install -D $src/completion/yadm.bash_completion $out/share/bash-completion/completions/yadm.bash
install -Dt $out/bin yadm
install -Dt $out/share/man/man1 yadm.1
install -D completion/yadm.zsh_completion $out/share/zsh/site-functions/_yadm
install -D completion/yadm.bash_completion $out/share/bash-completion/completions/yadm.bash
runHook postInstall
'';
@ -36,6 +36,7 @@ stdenv.mkDerivation {
* Supplies a method of encrypting confidential data so it can safely be stored in your repository.
'';
license = stdenv.lib.licenses.gpl3;
maintainers = with stdenv.lib.maintainers; [ abathur ];
platforms = stdenv.lib.platforms.unix;
};
}