public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

openiscsi: fix a file that was broken by upstream changing things to dynamic linking

Browse Source
This commit is contained in:
michael bishop 2016-04-30 15:28:11 -03:00
parent 61f110e890
commit c32618cd85
No known key found for this signature in database
GPG Key ID: C294FC1A485A409A
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/os-specific/linux/open-iscsi/default.nix
View File

@ -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 { 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-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 { src = fetchFromGitHub {
owner = "open-iscsi"; owner = "open-iscsi";
@ -19,13 +18,12 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-DUSE_KMOD"; NIX_CFLAGS_COMPILE = "-DUSE_KMOD";
preConfigure = '' preConfigure = ''
sed -i 's|/usr/|/|' Makefile sed -i 's|/usr|/|' Makefile
''; '';
postInstall = '' postInstall = ''
mkdir -pv $iscsistart/bin/ cp usr/iscsistart $out/sbin/
cp -v usr/iscsistart $iscsistart/bin/ $out/sbin/iscsistart -v
nuke-refs $iscsistart/bin/iscsistart
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
@ -33,5 +31,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl2Plus; license = licenses.gpl2Plus;
homepage = http://www.open-iscsi.com; homepage = http://www.open-iscsi.com;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = with maintainers; [ cleverca22 ];
}; };
} }