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

zpaq{,d}: clarify; improve description; maintain

Browse Source
This commit is contained in:
Tobias Geerinckx-Rice 2015-12-31 04:50:57 +01:00
parent d04e57ea6a
commit 4ae6598c0b
2 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/tools/archivers/zpaq/default.nix
View File

@ -9,9 +9,6 @@ let
url="http://mattmahoney.net/dc/zpaq705.zip"; url="http://mattmahoney.net/dc/zpaq705.zip";
sha256="0d1knq4f6693nvbwjx4wznb45hm4zyn4k88xvhynyk0dcbiy7ayq"; sha256="0d1knq4f6693nvbwjx4wznb45hm4zyn4k88xvhynyk0dcbiy7ayq";
}; };
buildInputs = [
unzip
];
isUnix = with stdenv; isLinux || isGNU || isDarwin || isFreeBSD || isOpenBSD; isUnix = with stdenv; isLinux || isGNU || isDarwin || isFreeBSD || isOpenBSD;
isx86 = stdenv.isi686 || stdenv.isx86_64; isx86 = stdenv.isi686 || stdenv.isx86_64;
compileFlags = with stdenv; "" compileFlags = with stdenv; ""
@ -24,15 +21,20 @@ let
in in
stdenv.mkDerivation { stdenv.mkDerivation {
inherit (s) name version; inherit (s) name version;
inherit buildInputs;
src = fetchurl { src = fetchurl {
inherit (s) url sha256; inherit (s) url sha256;
}; };
sourceRoot = "."; sourceRoot = ".";
buildInputs = [ unzip ];
buildPhase = '' buildPhase = ''
g++ ${compileFlags} -fPIC --shared libzpaq.cpp -o libzpaq.so g++ ${compileFlags} -fPIC --shared libzpaq.cpp -o libzpaq.so
g++ ${compileFlags} -L. -L"$out/lib" -lzpaq zpaq.cpp -o zpaq g++ ${compileFlags} -L. -L"$out/lib" -lzpaq zpaq.cpp -o zpaq
''; '';
installPhase = '' installPhase = ''
mkdir -p "$out"/{bin,include,lib,share/doc/zpaq} mkdir -p "$out"/{bin,include,lib,share/doc/zpaq}
cp libzpaq.so "$out/lib" cp libzpaq.so "$out/lib"
@ -40,12 +42,13 @@ stdenv.mkDerivation {
cp libzpaq.h "$out/include" cp libzpaq.h "$out/include"
cp readme.txt "$out/share/doc/zpaq" cp readme.txt "$out/share/doc/zpaq"
''; '';
meta = {
meta = with stdenv.lib; {
inherit (s) version; inherit (s) version;
description = ''An archiver with backward compatibility of versions for decompression''; description = "Incremental journaling backup utility and archiver";
license = stdenv.lib.licenses.gpl3Plus ; license = licenses.gpl3Plus ;
maintainers = [stdenv.lib.maintainers.raskin]; maintainers = with maintainers; [ raskin nckx ];
platforms = stdenv.lib.platforms.linux; platforms = platforms.linux;
homepage = "http://mattmahoney.net/dc/zpaq.html"; homepage = "http://mattmahoney.net/dc/zpaq.html";
}; };
} }

21
pkgs/tools/archivers/zpaq/zpaqd.nix
View File

@ -9,9 +9,6 @@ let
url="http://mattmahoney.net/dc/zpaqd633.zip"; url="http://mattmahoney.net/dc/zpaqd633.zip";
sha256="00zgc4mcmsd3d4afgzmrp6ymcyy8gb9kap815d5a3f9zhhzkz4dx"; sha256="00zgc4mcmsd3d4afgzmrp6ymcyy8gb9kap815d5a3f9zhhzkz4dx";
}; };
buildInputs = [
unzip
];
isUnix = with stdenv; isLinux || isGNU || isDarwin || isFreeBSD || isOpenBSD; isUnix = with stdenv; isLinux || isGNU || isDarwin || isFreeBSD || isOpenBSD;
isx86 = stdenv.isi686 || stdenv.isx86_64; isx86 = stdenv.isi686 || stdenv.isx86_64;
compileFlags = with stdenv; "" compileFlags = with stdenv; ""
@ -24,15 +21,20 @@ let
in in
stdenv.mkDerivation { stdenv.mkDerivation {
inherit (s) name version; inherit (s) name version;
inherit buildInputs;
src = fetchurl { src = fetchurl {
inherit (s) url sha256; inherit (s) url sha256;
}; };
sourceRoot = "."; sourceRoot = ".";
buildInputs = [ unzip ];
buildPhase = '' buildPhase = ''
g++ ${compileFlags} -fPIC --shared libzpaq.cpp -o libzpaq.so g++ ${compileFlags} -fPIC --shared libzpaq.cpp -o libzpaq.so
g++ ${compileFlags} -L. -L"$out/lib" -lzpaq zpaqd.cpp -o zpaqd g++ ${compileFlags} -L. -L"$out/lib" -lzpaq zpaqd.cpp -o zpaqd
''; '';
installPhase = '' installPhase = ''
mkdir -p "$out"/{bin,include,lib,share/doc/zpaq} mkdir -p "$out"/{bin,include,lib,share/doc/zpaq}
cp libzpaq.so "$out/lib" cp libzpaq.so "$out/lib"
@ -40,11 +42,12 @@ stdenv.mkDerivation {
cp libzpaq.h "$out/include" cp libzpaq.h "$out/include"
cp readme_zpaqd.txt "$out/share/doc/zpaq" cp readme_zpaqd.txt "$out/share/doc/zpaq"
''; '';
meta = {
meta = with stdenv.lib; {
inherit (s) version; inherit (s) version;
description = ''ZPAQ archiver decompressor and algorithm development tool''; description = "ZPAQ archive decompressor and algorithm development tool";
license = stdenv.lib.licenses.gpl3Plus ; license = licenses.gpl3Plus ;
maintainers = [stdenv.lib.maintainers.raskin]; maintainers = with maintainers; [ raskin nckx ];
platforms = stdenv.lib.platforms.linux; platforms = platforms.linux;
}; };
} }