From c32618cd851a2ec8838c683a4ae4c7d9a2e81220 Mon Sep 17 00:00:00 2001 From: michael bishop Date: Sat, 30 Apr 2016 15:28:11 -0300 Subject: openiscsi: fix a file that was broken by upstream changing things to dynamic linking --- pkgs/os-specific/linux/open-iscsi/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'pkgs/os-specific/linux/open-iscsi/default.nix') diff --git a/pkgs/os-specific/linux/open-iscsi/default.nix b/pkgs/os-specific/linux/open-iscsi/default.nix index 96ff1e52cdd..48055431304 100644 --- a/pkgs/os-specific/linux/open-iscsi/default.nix +++ b/pkgs/os-specific/linux/open-iscsi/default.nix @@ -1,10 +1,9 @@ -{ stdenv, fetchFromGitHub, nukeReferences, automake, autoconf, libtool, gettext, utillinux, openisns, openssl, kmod }: +{ stdenv, fetchFromGitHub, automake, autoconf, libtool, gettext, utillinux, openisns, openssl, kmod }: stdenv.mkDerivation rec { name = "open-iscsi-${version}"; version = "2.0-873-${stdenv.lib.substring 0 7 src.rev}"; - outputs = [ "out" "iscsistart" ]; - buildInputs = [ nukeReferences automake autoconf libtool gettext utillinux openisns.lib openssl kmod ]; + buildInputs = [ automake autoconf libtool gettext utillinux openisns.lib openssl kmod ]; src = fetchFromGitHub { owner = "open-iscsi"; @@ -19,13 +18,12 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-DUSE_KMOD"; preConfigure = '' - sed -i 's|/usr/|/|' Makefile + sed -i 's|/usr|/|' Makefile ''; postInstall = '' - mkdir -pv $iscsistart/bin/ - cp -v usr/iscsistart $iscsistart/bin/ - nuke-refs $iscsistart/bin/iscsistart + cp usr/iscsistart $out/sbin/ + $out/sbin/iscsistart -v ''; meta = with stdenv.lib; { @@ -33,5 +31,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; homepage = http://www.open-iscsi.com; platforms = platforms.linux; + maintainers = with maintainers; [ cleverca22 ]; }; } -- cgit 1.4.1