From 7bc2aaff0ed863308ed91b72226f8a2f49537d96 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Fri, 21 Jun 2019 20:29:16 +0200 Subject: [PATCH] unp: improve file copying & fix manpage --- pkgs/tools/archivers/unp/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/archivers/unp/default.nix b/pkgs/tools/archivers/unp/default.nix index 79c8e2f20ecc..106f75ab3769 100644 --- a/pkgs/tools/archivers/unp/default.nix +++ b/pkgs/tools/archivers/unp/default.nix @@ -1,11 +1,12 @@ { stdenv, lib, fetchurl, makeWrapper, perl, unrar, unzip, gzip, file, extraBackends ? [] }: -stdenv.mkDerivation rec { +let + runtime_bins = [ file unrar unzip gzip ] ++ extraBackends; + +in stdenv.mkDerivation rec { name = "unp-${version}"; version = "2.0-pre7"; - - runtime_bins = [ file unrar unzip gzip ] ++ extraBackends; - buildInputs = [ perl makeWrapper ] ++ runtime_bins; + buildInputs = [ perl makeWrapper ]; src = fetchurl { # url = "http://http.debian.net/debian/pool/main/u/unp/unp_2.0~pre7+nmu1.tar.bz2"; @@ -18,10 +19,10 @@ stdenv.mkDerivation rec { buildPhase = "true"; installPhase = '' mkdir -p $out/bin - mkdir -p $out/share/man - cp unp $out/bin/ - cp ucat $out/bin/ - cp debian/unp.1 $out/share/man + mkdir -p $out/share/man/man1 + install ./unp $out/bin/unp + install ./ucat $out/bin/ucat + cp debian/unp.1 $out/share/man/man1 wrapProgram $out/bin/unp \ --prefix PATH : ${lib.makeBinPath runtime_bins}