diff options
Diffstat (limited to 'pkgs/os-specific/linux/open-iscsi/default.nix')
| -rw-r--r-- | pkgs/os-specific/linux/open-iscsi/default.nix | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/pkgs/os-specific/linux/open-iscsi/default.nix b/pkgs/os-specific/linux/open-iscsi/default.nix index 01bbd9a9cc1..0640316b627 100644 --- a/pkgs/os-specific/linux/open-iscsi/default.nix +++ b/pkgs/os-specific/linux/open-iscsi/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchFromGitHub, automake, autoconf, libtool, gettext -, utillinux, openisns, openssl, kmod, perl, systemd, pkgconf +{ lib, stdenv, fetchFromGitHub, automake, autoconf, libtool, gettext +, util-linux, open-isns, openssl, kmod, perl, systemd, pkgconf }: stdenv.mkDerivation rec { pname = "open-iscsi"; - version = "2.1.2"; + version = "2.1.4"; nativeBuildInputs = [ autoconf automake gettext libtool perl pkgconf ]; - buildInputs = [ kmod openisns.lib openssl systemd utillinux ]; + buildInputs = [ kmod open-isns.lib openssl systemd util-linux ]; src = fetchFromGitHub { owner = "open-iscsi"; repo = "open-iscsi"; rev = version; - sha256 = "0fazf2ighj0akrvcj3jm3kd6wl9lgznvr38g6icwfkqk7bykjkam"; + sha256 = "sha256-HnvLLwxOnu7Oiige6A6zk9NmAI2ImcILp9eCfbdGiyI="; }; DESTDIR = "$(out)"; @@ -25,8 +25,16 @@ stdenv.mkDerivation rec { sed -i 's|/usr|/|' Makefile ''; + installFlags = [ + "install" + "install_systemd" + ]; + postInstall = '' cp usr/iscsistart $out/sbin/ + for f in $out/lib/systemd/system/*; do + substituteInPlace $f --replace /sbin $out/bin + done $out/sbin/iscsistart -v ''; @@ -34,9 +42,9 @@ stdenv.mkDerivation rec { sed -i "s|/sbin/iscsiadm|$out/bin/iscsiadm|" $out/bin/iscsi_fw_login ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A high performance, transport independent, multi-platform implementation of RFC3720"; - license = licenses.gpl2; + license = licenses.gpl2Plus; homepage = "https://www.open-iscsi.com"; platforms = platforms.linux; maintainers = with maintainers; [ cleverca22 zaninime ]; |