diff options
author | Francesco Zanini <francesco@zanini.me> | 2018-11-19 13:34:30 +0100 |
---|---|---|
committer | Francesco Zanini <francesco@zanini.me> | 2018-11-24 12:25:42 +0100 |
commit | 6ce3525cf0ba338e4e7dee0bd9eab5252ce99417 (patch) | |
tree | 5039ada41b6b81b83618e34d74839f81888d22eb /pkgs/os-specific/linux/open-iscsi | |
parent | 04719a005202a9b0a8e815c90f94a5e9a1fce05d (diff) |
openiscsi: 2.0-873 -> 2.0-877
Diffstat (limited to 'pkgs/os-specific/linux/open-iscsi')
-rw-r--r-- | pkgs/os-specific/linux/open-iscsi/default.nix | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/pkgs/os-specific/linux/open-iscsi/default.nix b/pkgs/os-specific/linux/open-iscsi/default.nix index 4805543130484..a2644fcbc3fdc 100644 --- a/pkgs/os-specific/linux/open-iscsi/default.nix +++ b/pkgs/os-specific/linux/open-iscsi/default.nix @@ -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 { 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 { owner = "open-iscsi"; repo = "open-iscsi"; - rev = "4c1f2d90ef1c73e33d9f1e4ae9c206ffe015a8f9"; - sha256 = "0h030zk4zih3l8z5662b3kcifdxlakbwwkz1afb7yf0cicds7va8"; + rev = version; + sha256 = "0v3dsrl34pdx0yl5jsanrpgg3vw466rl8k81hkshgq3a5mq5qhf6"; }; - + DESTDIR = "$(out)"; - - NIX_LDFLAGS = "-lkmod"; + + NIX_LDFLAGS = "-lkmod -lsystemd"; NIX_CFLAGS_COMPILE = "-DUSE_KMOD"; preConfigure = '' sed -i 's|/usr|/|' Makefile ''; - + postInstall = '' cp usr/iscsistart $out/sbin/ $out/sbin/iscsistart -v @@ -28,9 +32,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A high performance, transport independent, multi-platform implementation of RFC3720"; - license = licenses.gpl2Plus; - homepage = http://www.open-iscsi.com; + license = licenses.gpl2; + homepage = https://www.open-iscsi.com; platforms = platforms.linux; - maintainers = with maintainers; [ cleverca22 ]; + maintainers = with maintainers; [ cleverca22 zaninime ]; }; } |