Merge pull request #95274 from misuzu/qemu-iscsi

This commit is contained in:
Sandro 2021-01-17 20:16:06 +01:00 committed by GitHub
commit 1afec60627
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 0 deletions

View File

@ -19,6 +19,7 @@
, cephSupport ? false, ceph
, openGLSupport ? sdlSupport, mesa, epoxy, libdrm
, virglSupport ? openGLSupport, virglrenderer
, libiscsiSupport ? true, libiscsi
, smbdSupport ? false, samba
, tpmSupport ? true
, hostCpuOnly ? false
@ -72,6 +73,7 @@ stdenv.mkDerivation rec {
++ optionals cephSupport [ ceph ]
++ optionals openGLSupport [ mesa epoxy libdrm ]
++ optionals virglSupport [ virglrenderer ]
++ optionals libiscsiSupport [ libiscsi ]
++ optionals smbdSupport [ samba ];
enableParallelBuilding = true;
@ -148,6 +150,7 @@ stdenv.mkDerivation rec {
++ optional openGLSupport "--enable-opengl"
++ optional virglSupport "--enable-virglrenderer"
++ optional tpmSupport "--enable-tpm"
++ optional libiscsiSupport "--enable-libiscsi"
++ optional smbdSupport "--smbd=${samba}/bin/smbd";
doCheck = false; # tries to access /dev

View File

@ -0,0 +1,23 @@
{ stdenv, fetchFromGitHub, autoreconfHook }:
stdenv.mkDerivation rec {
pname = "libiscsi";
version = "1.19.0";
src = fetchFromGitHub {
owner = "sahlberg";
repo = "libiscsi";
rev = version;
sha256 = "0ajrkkg5awmi8m4b3mha7h07ylg18k252qprvk1sgq0qbyd66zy7";
};
nativeBuildInputs = [ autoreconfHook ];
meta = with stdenv.lib; {
description = "iscsi client library and utilities";
homepage = "https://github.com/sahlberg/libiscsi";
license = licenses.lgpl2;
platforms = platforms.unix;
maintainers = with maintainers; [ misuzu ];
};
}

View File

@ -5796,6 +5796,8 @@ in
libircclient = callPackage ../development/libraries/libircclient { };
libiscsi = callPackage ../development/libraries/libiscsi { };
libisds = callPackage ../development/libraries/libisds { };
libite = callPackage ../development/libraries/libite { };