diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-01-17 20:16:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-17 20:16:06 +0100 |
| commit | 1afec6062749abd6cb20916e9391a75931deb6ad (patch) | |
| tree | dd22a5c96fe20b91044c25d7b9b13f8526149f41 | |
| parent | f42fb61037a64133669e74009f2fedbed6bce5ad (diff) | |
| parent | c5dd597870e90f2bf9a03c5a61517eab5c145740 (diff) | |
| download | nixlib-1afec6062749abd6cb20916e9391a75931deb6ad.tar nixlib-1afec6062749abd6cb20916e9391a75931deb6ad.tar.gz nixlib-1afec6062749abd6cb20916e9391a75931deb6ad.tar.bz2 nixlib-1afec6062749abd6cb20916e9391a75931deb6ad.tar.lz nixlib-1afec6062749abd6cb20916e9391a75931deb6ad.tar.xz nixlib-1afec6062749abd6cb20916e9391a75931deb6ad.tar.zst nixlib-1afec6062749abd6cb20916e9391a75931deb6ad.zip | |
Merge pull request #95274 from misuzu/qemu-iscsi
| -rw-r--r-- | pkgs/applications/virtualization/qemu/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/libraries/libiscsi/default.nix | 23 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 28 insertions, 0 deletions
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index bf6f2769e7ec..beb388afa7d5 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -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 diff --git a/pkgs/development/libraries/libiscsi/default.nix b/pkgs/development/libraries/libiscsi/default.nix new file mode 100644 index 000000000000..2f7e3c410dd8 --- /dev/null +++ b/pkgs/development/libraries/libiscsi/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fcf08de2fdf0..d4b12d55d6b0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |