unar: minor cleanups

This commit is contained in:
Peter Hoeg 2018-01-18 15:26:15 +08:00
parent ea145b68a0
commit 0e23e81cc0

View File

@ -1,8 +1,10 @@
{ stdenv, fetchurl, gnustep, unzip, bzip2, zlib, icu, openssl }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
let
pname = "unar";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
version = "1.10.1";
src = fetchurl {
@ -10,23 +12,20 @@ stdenv.mkDerivation rec {
sha256 = "0aq9zlar5vzr5qxphws8dm7ax60bsfsw77f4ciwa5dq5lla715j0";
};
buildInputs = [
gnustep.make unzip gnustep.base bzip2.dev
zlib.dev icu.dev openssl.dev
];
buildInputs = [ gnustep.base bzip2 icu openssl zlib ];
nativeBuildInputs = [ gnustep.make unzip ];
enableParallelBuilding = true;
postPatch = ''
substituteInPlace Makefile.linux \
for f in Makefile.linux ../UniversalDetector/Makefile.linux ; do
substituteInPlace $f \
--replace "CC = gcc" "CC=cc" \
--replace "CXX = g++" "CXX=c++" \
--replace "OBJCC = gcc" "OBJCC=cc" \
--replace "OBJCXX = g++" "OBJCXX=c++"
substituteInPlace ../UniversalDetector/Makefile.linux \
--replace "CC = gcc" "CC=cc" \
--replace "CXX = g++" "CXX=c++" \
--replace "OBJCC = gcc" "OBJCC=c" \
--replace "OBJCXX = g++" "OBJCXX=c++"
done
'';
makefile = "Makefile.linux";
@ -34,17 +33,16 @@ stdenv.mkDerivation rec {
sourceRoot = "./The Unarchiver/XADMaster";
installPhase = ''
mkdir -p $out/bin
cp lsar $out/bin
cp unar $out/bin
runHook preInstall
mkdir -p $out/share/man/man1
cp ../Extra/lsar.1 $out/share/man/man1
cp ../Extra/unar.1 $out/share/man/man1
install -Dm755 -t $out/bin lsar unar
install -Dm644 -t $out/share/man/man1 ../Extra/{lsar,unar}.1
mkdir -p $out/etc/bash_completion.d
cp ../Extra/lsar.bash_completion $out/etc/bash_completion.d/lsar
cp ../Extra/unar.bash_completion $out/etc/bash_completion.d/unar
runHook postInstall
'';
meta = with stdenv.lib; {