libiscsi: 1.19.0 -> 1.20.0
Diff: https://github.com/sahlberg/libiscsi/compare/1.19.0...1.20.0
This commit is contained in:
parent
2726f127c1
commit
b6c7ea1a1a
1 changed files with 7 additions and 5 deletions
|
@ -2,24 +2,26 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "libiscsi";
|
pname = "libiscsi";
|
||||||
version = "1.19.0";
|
version = "1.20.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "sahlberg";
|
owner = "sahlberg";
|
||||||
repo = "libiscsi";
|
repo = "libiscsi";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "0ajrkkg5awmi8m4b3mha7h07ylg18k252qprvk1sgq0qbyd66zy7";
|
sha256 = "sha256-idiK9JowKhGAk5F5qJ57X14Q2Y0TbIKRI02onzLPkas=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
substituteInPlace lib/socket.c \
|
substituteInPlace lib/socket.c \
|
||||||
--replace "void iscsi_decrement_iface_rr() {" "void iscsi_decrement_iface_rr(void) {"
|
--replace-fail "void iscsi_decrement_iface_rr() {" "void iscsi_decrement_iface_rr(void) {"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
nativeBuildInputs = [ autoreconfHook ];
|
nativeBuildInputs = [ autoreconfHook ];
|
||||||
|
|
||||||
# This problem is gone on libiscsi master.
|
env = lib.optionalAttrs (stdenv.is32bit || stdenv.isDarwin) {
|
||||||
env.NIX_CFLAGS_COMPILE = toString (lib.optional stdenv.hostPlatform.is32bit "-Wno-error=sign-compare");
|
# iscsi-discard.c:223:57: error: format specifies type 'unsigned long' but the argument has type 'uint64_t' (aka 'unsigned long long') [-Werror,-Wformat]
|
||||||
|
NIX_CFLAGS_COMPILE = "-Wno-error=format";
|
||||||
|
};
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "iscsi client library and utilities";
|
description = "iscsi client library and utilities";
|
||||||
|
|
Loading…
Reference in a new issue