Merge pull request #95274 from misuzu/qemu-iscsi

authored by

Sandro and committed by
GitHub
1afec606 f42fb610

+28
+3
pkgs/applications/virtualization/qemu/default.nix
··· 19 19 , cephSupport ? false, ceph 20 20 , openGLSupport ? sdlSupport, mesa, epoxy, libdrm 21 21 , virglSupport ? openGLSupport, virglrenderer 22 + , libiscsiSupport ? true, libiscsi 22 23 , smbdSupport ? false, samba 23 24 , tpmSupport ? true 24 25 , hostCpuOnly ? false ··· 72 73 ++ optionals cephSupport [ ceph ] 73 74 ++ optionals openGLSupport [ mesa epoxy libdrm ] 74 75 ++ optionals virglSupport [ virglrenderer ] 76 + ++ optionals libiscsiSupport [ libiscsi ] 75 77 ++ optionals smbdSupport [ samba ]; 76 78 77 79 enableParallelBuilding = true; ··· 148 150 ++ optional openGLSupport "--enable-opengl" 149 151 ++ optional virglSupport "--enable-virglrenderer" 150 152 ++ optional tpmSupport "--enable-tpm" 153 + ++ optional libiscsiSupport "--enable-libiscsi" 151 154 ++ optional smbdSupport "--smbd=${samba}/bin/smbd"; 152 155 153 156 doCheck = false; # tries to access /dev
+23
pkgs/development/libraries/libiscsi/default.nix
··· 1 + { stdenv, fetchFromGitHub, autoreconfHook }: 2 + 3 + stdenv.mkDerivation rec { 4 + pname = "libiscsi"; 5 + version = "1.19.0"; 6 + 7 + src = fetchFromGitHub { 8 + owner = "sahlberg"; 9 + repo = "libiscsi"; 10 + rev = version; 11 + sha256 = "0ajrkkg5awmi8m4b3mha7h07ylg18k252qprvk1sgq0qbyd66zy7"; 12 + }; 13 + 14 + nativeBuildInputs = [ autoreconfHook ]; 15 + 16 + meta = with stdenv.lib; { 17 + description = "iscsi client library and utilities"; 18 + homepage = "https://github.com/sahlberg/libiscsi"; 19 + license = licenses.lgpl2; 20 + platforms = platforms.unix; 21 + maintainers = with maintainers; [ misuzu ]; 22 + }; 23 + }
+2
pkgs/top-level/all-packages.nix
··· 5796 5796 5797 5797 libircclient = callPackage ../development/libraries/libircclient { }; 5798 5798 5799 + libiscsi = callPackage ../development/libraries/libiscsi { }; 5800 + 5799 5801 libisds = callPackage ../development/libraries/libisds { }; 5800 5802 5801 5803 libite = callPackage ../development/libraries/libite { };