From a6037ef47dd0945f066a2e12d59cda329fca133d Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 15 Jun 2022 23:01:51 +0100 Subject: [PATCH] openiscsi: 2.1.4 -> 2.1.7 changelog: https://github.com/open-iscsi/open-iscsi/blob/master/Changelog --- pkgs/os-specific/linux/open-iscsi/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/open-iscsi/default.nix b/pkgs/os-specific/linux/open-iscsi/default.nix index a4f6565f0c70..ebeb3516f243 100644 --- a/pkgs/os-specific/linux/open-iscsi/default.nix +++ b/pkgs/os-specific/linux/open-iscsi/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "open-iscsi"; - version = "2.1.4"; + version = "2.1.7"; nativeBuildInputs = [ autoconf automake gettext libtool perl pkgconf ]; buildInputs = [ kmod open-isns.lib openssl systemd util-linux ]; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "open-iscsi"; repo = "open-iscsi"; rev = version; - sha256 = "sha256-HnvLLwxOnu7Oiige6A6zk9NmAI2ImcILp9eCfbdGiyI="; + sha256 = "sha256-R1ttHHxVSQ5TGtWVy4I9BAmEJfcRhKRD5jThoeddjUw="; }; DESTDIR = "$(out)"; @@ -23,8 +23,17 @@ stdenv.mkDerivation rec { preConfigure = '' sed -i 's|/usr|/|' Makefile + + # Remove blanket -Werror. Fails for minor error on gcc-11. + substituteInPlace usr/Makefile --replace ' -Werror ' ' ' ''; + # avoid /usr/bin/install + makeFlags = [ + "INSTALL=install" + "SED=sed" + ]; + installFlags = [ "install" "install_systemd"