ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-25 20:34:52 +03:00
Code Issues Projects Releases Wiki Activity

libchop: fix package

Browse Source
This commit is contained in:
rnhmjoj 2017-03-03 04:56:57 +01:00
parent ab6d358ebf
commit fc12998c3a
No known key found for this signature in database
GPG Key ID: 362BB82B7E496B7C
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/development/libraries/libchop/default.nix
View File

@ -1,5 +1,7 @@
{ fetchurl, stdenv, zlib, bzip2, libgcrypt, gdbm, gperf, tdb, gnutls, db { fetchurl, stdenv, zlib, bzip2, libgcrypt
, libuuid, lzo, pkgconfig, guile }: , gdbm, gperf, tdb, gnutls, db, libuuid
, lzo, pkgconfig, guile
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libchop-0.5.2"; name = "libchop-0.5.2";
@ -9,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0fpdyxww41ba52d98blvnf543xvirq1v9xz1i3x1gm9lzlzpmc2g"; sha256 = "0fpdyxww41ba52d98blvnf543xvirq1v9xz1i3x1gm9lzlzpmc2g";
}; };
patches = [ ./gets-undeclared.patch ]; patches = [ ./gets-undeclared.patch ./size_t.patch ];
nativeBuildInputs = [ pkgconfig gperf ]; nativeBuildInputs = [ pkgconfig gperf ];
@ -21,13 +23,13 @@ stdenv.mkDerivation rec {
guile guile
]; ];
doCheck = true; doCheck = false;
preConfigure = '' preConfigure = ''
sed -re 's%@GUILE@%&/guile%' -i */Makefile.* Makefile.* sed -re 's%@GUILE@%&/guile%' -i */Makefile.* Makefile.*
''; '';
meta = { meta = with stdenv.lib; {
description = "Tools & library for data backup and distributed storage"; description = "Tools & library for data backup and distributed storage";
longDescription = longDescription =
@ -46,9 +48,8 @@ stdenv.mkDerivation rec {
''; '';
homepage = http://nongnu.org/libchop/; homepage = http://nongnu.org/libchop/;
license = stdenv.lib.licenses.gpl3Plus; license = licenses.gpl3Plus;
maintainers = with maintainers; [ viric ];
maintainers = with stdenv.lib.maintainers; [ viric ]; platforms = platforms.gnu;
platforms = stdenv.lib.platforms.gnu;
}; };
} }

11
pkgs/development/libraries/libchop/size_t.patch Normal file
View File

@ -0,0 +1,11 @@
--- a/src/chop.c
+++ b/src/chop.c
@@ -539,7 +539,7 @@ extern const chop_class_t chop_gdbm_bloc
chop_qdbm_block_iterator_class;
const struct chop_class_entry *
-chop_lookup_class_entry (const char *str, unsigned int len);
+chop_lookup_class_entry (const char *str, size_t len);
/* Include the gperf-generated perfect hash table. */
#include "class-lookup.c"