diff options
| author | Patrick Mahoney <pat@polycrystal.org> | 2015-05-13 17:03:59 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2015-05-18 15:26:06 -0500 |
| commit | 02e46cacc6b051a31b8f18df2ac7bd3658ac6c85 (patch) | |
| tree | 624baa3ee87b2743f2ffaae6d1a2c2e39258c8ea /pkgs/tools/misc/keychain | |
| parent | d60058af4b5a88ed41ad428645583b720b72ab19 (diff) | |
| download | nixpkgs-02e46cacc6b051a31b8f18df2ac7bd3658ac6c85.tar nixpkgs-02e46cacc6b051a31b8f18df2ac7bd3658ac6c85.tar.gz nixpkgs-02e46cacc6b051a31b8f18df2ac7bd3658ac6c85.tar.bz2 nixpkgs-02e46cacc6b051a31b8f18df2ac7bd3658ac6c85.tar.lz nixpkgs-02e46cacc6b051a31b8f18df2ac7bd3658ac6c85.tar.xz nixpkgs-02e46cacc6b051a31b8f18df2ac7bd3658ac6c85.tar.zst nixpkgs-02e46cacc6b051a31b8f18df2ac7bd3658ac6c85.zip | |
keychain: fixup shebang, use upstream builder, install manpage
fixup shebang - build was not running fixupPhase, and shebang was pointing to
/bin/sh. On a system where /bin/sh links to dash, this results in errors:
/nix/store/v40yk16fl1rhvr6zz91ij753ziyphwwp-keychain-2.8.0/bin/.keychain-wrapped: 59: /nix/store/v40yk16fl1rhvr6zz91ij753ziyphwwp-keychain-2.8.0/bin/.keychain-wrapped: shopt: not found
/nix/store/v40yk16fl1rhvr6zz91ij753ziyphwwp-keychain-2.8.0/bin/.keychain-wrapped: 686: /nix/store/v40yk16fl1rhvr6zz91ij753ziyphwwp-keychain-2.8.0/bin/.keychain-wrapped: Syntax error: "(" unexpected (expecting ")")
use upstream builder - the include Makefile uses perl to generate a manpage and
insert the same text into the keychain script for '--help' output, which was
otherwise missing:
$ keychain --help
* keychain 2.8.0 ~ http://www.funtoo.org
[snip]
INSERT_POD_OUTPUT_HERE
install manpage - self explanatory
Diffstat (limited to 'pkgs/tools/misc/keychain')
| -rw-r--r-- | pkgs/tools/misc/keychain/default.nix | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/pkgs/tools/misc/keychain/default.nix b/pkgs/tools/misc/keychain/default.nix index 1ed6be071a5..0892061a50d 100644 --- a/pkgs/tools/misc/keychain/default.nix +++ b/pkgs/tools/misc/keychain/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, makeWrapper, coreutils, openssh, gnupg -, procps, gnugrep, gawk, findutils, gnused }: +, perl, procps, gnugrep, gawk, findutils, gnused }: stdenv.mkDerivation rec { name = "keychain-${version}"; @@ -12,15 +12,12 @@ stdenv.mkDerivation rec { sha256 = "0ajas58cv8mp5wb6hn1zhsqiwfxvx69p4f91a5j2as299rxgrxlp"; }; - phases = [ "unpackPhase" "patchPhase" "buildPhase" ]; + buildInputs = [ makeWrapper perl ]; - buildInputs = [ makeWrapper ]; - - patchPhase = "sed -i -e 's,version=.*,version=\"${version}\",g' keychain.sh"; - - buildPhase = '' - mkdir -p $out/bin - cp keychain.sh $out/bin/keychain + installPhase = '' + mkdir -p $out/{bin,share/man/man1} + cp keychain $out/bin/keychain + cp keychain.1 $out/share/man/man1 wrapProgram $out/bin/keychain \ --prefix PATH ":" "${coreutils}/bin" \ --prefix PATH ":" "${openssh}/bin" \ |