b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #108866 from markuskowa/new-targetisns

Browse source 
target-isns: init at 0.6.8
This commit is contained in:
Sandro 2021-01-14 21:06:59 +01:00 committed by GitHub
parent 7cb3bffc34 abd767dce9
commit 22d184ae8d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 55 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
pkgs/os-specific/linux/target-isns/default.nix Normal file
View file

@ -0,0 +1,36 @@
{ stdenv, cmake, fetchFromGitHub, fetchpatch } :
stdenv.mkDerivation rec {
pname = "target-isns";
version = "0.6.8";
src = fetchFromGitHub {
owner = "open-iscsi";
repo = pname;
rev = "v${version}";
sha256 = "1b6jjalvvkkjyjbg1pcgk8vmvc6xzzksyjnh2pfi45bbpya4zxim";
};
patches = [
# fix absoulute paths
./install_prefix_path.patch
# fix gcc 10 compiler warning, remove with next update
(fetchpatch {
url = "https://github.com/open-iscsi/target-isns/commit/3d0c47dd89bcf83d828bcc22ecaaa5f58d78b58e.patch";
sha256 = "1x2bkc1ff15621svhpq1r11m0q4ajv0j4fng6hm7wkkbr2s6d1vx";
})
];
cmakeFlags = [ "-DSUPPORT_SYSTEMD=ON" ];
nativeBuildInputs = [ cmake ];
meta = with stdenv.lib; {
description = "iSNS client for the Linux LIO iSCSI target";
homepage = "https://github.com/open-iscsi/target-isns";
maintainers = [ maintainers.markuskowa ];
license = licenses.gpl2Only;
platforms = platforms.linux;
};
}

17
pkgs/os-specific/linux/target-isns/install_prefix_path.patch Normal file
View file

@ -0,0 +1,17 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f46144d..aeac3e4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,10 +14,10 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Werror")
option(SUPPORT_SYSTEMD "Support service control via systemd" OFF)
add_subdirectory(src)
-install(FILES target-isns.conf DESTINATION /etc/)
+install(FILES target-isns.conf DESTINATION ${CMAKE_INSTALL_PREFIX}/etc/)
install(FILES target-isns.8 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man8/)
if (SUPPORT_SYSTEMD)
- install(FILES target-isns.service DESTINATION /usr/lib/systemd/system/)
+ install(FILES target-isns.service DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/systemd/system/)
endif (SUPPORT_SYSTEMD)
add_subdirectory(tests)

2
pkgs/top-level/all-packages.nix
View file

@ -7844,6 +7844,8 @@ in
targetcli = callPackage ../os-specific/linux/targetcli { };
target-isns = callPackage ../os-specific/linux/target-isns { };
tarsnap = callPackage ../tools/backup/tarsnap { };
tarsnapper = callPackage ../tools/backup/tarsnapper { };