public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

keychain: fixup shebang, use upstream builder, install manpage

Browse Source 
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
This commit is contained in:
Patrick Mahoney
2015-05-18 15:26:06 -05:00
committed by Thomas Tuegel
parent d60058af4b
commit 02e46cacc6
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/misc/keychain/default.nix
+6 -9
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, makeWrapper, coreutils, openssh, gnupg { stdenv, fetchFromGitHub, makeWrapper, coreutils, openssh, gnupg
, procps, gnugrep, gawk, findutils, gnused }: , perl, procps, gnugrep, gawk, findutils, gnused }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "keychain-${version}"; name = "keychain-${version}";
@@ -12,15 +12,12 @@ stdenv.mkDerivation rec {
sha256 = "0ajas58cv8mp5wb6hn1zhsqiwfxvx69p4f91a5j2as299rxgrxlp"; sha256 = "0ajas58cv8mp5wb6hn1zhsqiwfxvx69p4f91a5j2as299rxgrxlp";
}; };
phases = [ "unpackPhase" "patchPhase" "buildPhase" ]; buildInputs = [ makeWrapper perl ];
buildInputs = [ makeWrapper ]; installPhase = ''
mkdir -p $out/{bin,share/man/man1}
patchPhase = "sed -i -e 's,version=.*,version=\"${version}\",g' keychain.sh"; cp keychain $out/bin/keychain
cp keychain.1 $out/share/man/man1
buildPhase = ''
mkdir -p $out/bin
cp keychain.sh $out/bin/keychain
wrapProgram $out/bin/keychain \ wrapProgram $out/bin/keychain \
--prefix PATH ":" "${coreutils}/bin" \ --prefix PATH ":" "${coreutils}/bin" \
--prefix PATH ":" "${openssh}/bin" \ --prefix PATH ":" "${openssh}/bin" \