Merge pull request #50873 from zaninime/openscsi

openiscsi: 2.0-873 -> 2.0-877
This commit is contained in:
markuskowa 2018-11-24 13:13:02 +01:00 committed by GitHub
commit 651baa7ded
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,26 +1,30 @@
{ stdenv, fetchFromGitHub, automake, autoconf, libtool, gettext, utillinux, openisns, openssl, kmod }: { stdenv, fetchFromGitHub, automake, autoconf, libtool, gettext
, utillinux, openisns, openssl, kmod, perl, systemd, pkgconf
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "open-iscsi-${version}"; name = "open-iscsi-${version}";
version = "2.0-873-${stdenv.lib.substring 0 7 src.rev}"; version = "2.0.877";
nativeBuildInputs = [ autoconf automake gettext libtool perl pkgconf ];
buildInputs = [ kmod openisns.lib openssl systemd utillinux ];
buildInputs = [ automake autoconf libtool gettext utillinux openisns.lib openssl kmod ];
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "open-iscsi"; owner = "open-iscsi";
repo = "open-iscsi"; repo = "open-iscsi";
rev = "4c1f2d90ef1c73e33d9f1e4ae9c206ffe015a8f9"; rev = version;
sha256 = "0h030zk4zih3l8z5662b3kcifdxlakbwwkz1afb7yf0cicds7va8"; sha256 = "0v3dsrl34pdx0yl5jsanrpgg3vw466rl8k81hkshgq3a5mq5qhf6";
}; };
DESTDIR = "$(out)"; DESTDIR = "$(out)";
NIX_LDFLAGS = "-lkmod"; NIX_LDFLAGS = "-lkmod -lsystemd";
NIX_CFLAGS_COMPILE = "-DUSE_KMOD"; NIX_CFLAGS_COMPILE = "-DUSE_KMOD";
preConfigure = '' preConfigure = ''
sed -i 's|/usr|/|' Makefile sed -i 's|/usr|/|' Makefile
''; '';
postInstall = '' postInstall = ''
cp usr/iscsistart $out/sbin/ cp usr/iscsistart $out/sbin/
$out/sbin/iscsistart -v $out/sbin/iscsistart -v
@ -28,9 +32,9 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A high performance, transport independent, multi-platform implementation of RFC3720"; description = "A high performance, transport independent, multi-platform implementation of RFC3720";
license = licenses.gpl2Plus; license = licenses.gpl2;
homepage = http://www.open-iscsi.com; homepage = https://www.open-iscsi.com;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = with maintainers; [ cleverca22 ]; maintainers = with maintainers; [ cleverca22 zaninime ];
}; };
} }