diff options
| author | Brice Waegeneire <brice.wge@gmail.com> | 2019-03-20 10:06:23 +0100 |
|---|---|---|
| committer | Brice Waegeneire <brice.wge@gmail.com> | 2019-04-05 14:10:41 +0200 |
| commit | 9de07305b4ac6770b2c24116407c60eaea33a1ea (patch) | |
| tree | af6395d251d58160f2db6c261a5182a56aa91d45 /pkgs/os-specific/linux/tomb | |
| parent | c254bb6c70d061112d606038906ab7696070a855 (diff) | |
| download | nixpkgs-9de07305b4ac6770b2c24116407c60eaea33a1ea.tar nixpkgs-9de07305b4ac6770b2c24116407c60eaea33a1ea.tar.gz nixpkgs-9de07305b4ac6770b2c24116407c60eaea33a1ea.tar.bz2 nixpkgs-9de07305b4ac6770b2c24116407c60eaea33a1ea.tar.lz nixpkgs-9de07305b4ac6770b2c24116407c60eaea33a1ea.tar.xz nixpkgs-9de07305b4ac6770b2c24116407c60eaea33a1ea.tar.zst nixpkgs-9de07305b4ac6770b2c24116407c60eaea33a1ea.zip | |
tomb: remove gpg symlink
Diffstat (limited to 'pkgs/os-specific/linux/tomb')
| -rw-r--r-- | pkgs/os-specific/linux/tomb/default.nix | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/os-specific/linux/tomb/default.nix b/pkgs/os-specific/linux/tomb/default.nix index a43c53e02bb..d8fe785650c 100644 --- a/pkgs/os-specific/linux/tomb/default.nix +++ b/pkgs/os-specific/linux/tomb/default.nix @@ -1,4 +1,6 @@ -{ stdenv, lib, fetchFromGitHub, gettext, zsh, pinentry, cryptsetup, gnupg, makeWrapper }: +{ stdenv, lib, fetchFromGitHub, makeWrapper +, gettext, zsh, pinentry, cryptsetup, gnupg, utillinux, e2fsprogs +}: stdenv.mkDerivation rec { name = "tomb-${version}"; @@ -11,6 +13,8 @@ stdenv.mkDerivation rec { sha256 = "1wk1aanzfln88min29p5av2j8gd8vj5afbs2gvarv7lvx1vi7kh1"; }; + buildInputs = [ zsh pinentry ]; + nativeBuildInputs = [ makeWrapper ]; postPatch = '' @@ -19,19 +23,15 @@ stdenv.mkDerivation rec { --replace 'TOMBEXEC=$0' 'TOMBEXEC=tomb' ''; - buildPhase = '' - # manually patch the interpreter - sed -i -e "1s|.*|#!${zsh}/bin/zsh|g" tomb - ''; + doInstallCheck = true; + installCheckPhase = "$out/bin/tomb -h 2>/dev/null"; installPhase = '' install -Dm755 tomb $out/bin/tomb install -Dm644 doc/tomb.1 $out/share/man/man1/tomb.1 - ln -s ${gnupg}/bin/gpg $out/bin/gpg - wrapProgram $out/bin/tomb \ - --prefix PATH : $out/bin:${lib.makeBinPath [ cryptsetup gettext pinentry ]} + --prefix PATH : $out/bin:${lib.makeBinPath [ cryptsetup gettext gnupg pinentry utillinux e2fsprogs ]} ''; meta = with stdenv.lib; { |