Merge pull request #96480 from Izorkin/dar

This commit is contained in:
Jörg Thalheim 2020-08-31 06:54:45 +01:00 committed by GitHub
commit 95f87793c4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 55 additions and 6 deletions

View file

@ -0,0 +1,35 @@
{ stdenv, fetchurl }:
with stdenv.lib;
stdenv.mkDerivation rec {
version = "1.3.0";
pname = "libthreadar";
src = fetchurl {
url = "mirror://sourceforge/libthreadar/${pname}-${version}.tar.gz";
sha256 = "0g2wxykawlsj6ma9slbbk0bxynqvmkwhaln2fiwc21x7nhjvpn9z";
};
outputs = [ "out" "dev" ];
configureFlags = [
"--disable-build-html"
];
postInstall = ''
# Disable html help
rm -r "$out"/share
'';
meta = {
homepage = "http://libthreadar.sourceforge.net/";
description = ''
Libthreadar is a C++ library providing a small set of C++ classes to manipulate
threads in a very simple and efficient way from your C++ code.
'';
maintainers = with maintainers; [ izorkin ];
license = licenses.lgpl3;
platforms = platforms.unix;
};
}

View file

@ -1,18 +1,28 @@
{ stdenv, fetchurl, zlib, bzip2, openssl, attr, lzo, libgcrypt, e2fsprogs, gpgme, xz }:
{ stdenv, fetchurl
, attr, e2fsprogs
, curl, librsync, libthreadar
, gpgme, libgcrypt, openssl
, bzip2, lzo, xz, zlib
}:
with stdenv.lib;
stdenv.mkDerivation rec {
version = "2.6.9";
version = "2.6.10";
pname = "dar";
src = fetchurl {
url = "mirror://sourceforge/dar/${pname}-${version}.tar.gz";
sha256 = "1jzqq54w1dix2qdlj4hr9dpq9fnp23h102bk8d2gq6k7n2zgaj6v";
sha256 = "1ryj4xxar18hshg38j1ljhplypgmfprwqn72k1jwxi28qravg80n";
};
buildInputs = [ zlib bzip2 openssl lzo libgcrypt gpgme xz ]
++ optionals stdenv.isLinux [ attr e2fsprogs ];
outputs = [ "out" "dev" ];
buildInputs = [
curl librsync libthreadar
gpgme libgcrypt openssl
bzip2 lzo xz zlib
] ++ optionals stdenv.isLinux [ attr e2fsprogs ];
configureFlags = [
"--disable-birthtime"
@ -23,7 +33,8 @@ stdenv.mkDerivation rec {
];
postInstall = ''
rm -r "$out"/share/dar # Disable html help
# Disable html help
rm -r "$out"/share/dar
'';
enableParallelBuilding = true;
@ -33,6 +44,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = "http://dar.linux.free.fr";
description = "Disk ARchiver, allows backing up files into indexed archives";
maintainers = with maintainers; [ izorkin ];
license = licenses.gpl2;
platforms = platforms.unix;
};

View file

@ -13980,6 +13980,8 @@ in
libtheora = callPackage ../development/libraries/libtheora { };
libthreadar = callPackage ../development/libraries/libthreadar { };
libtiff = callPackage ../development/libraries/libtiff { };
libtiger = callPackage ../development/libraries/libtiger { };