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

Merge pull request #179443 from B4dM4n/openiscsi-fix-service

Browse source 
openiscsi: fix systemd service location
This commit is contained in:
Sergei Trofimovich 2022-06-28 19:28:00 +01:00 committed by GitHub
parent 3cff3f75b4 d1ffd40bd7
commit f3f952c338
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/os-specific/linux/open-iscsi/default.nix
View file

@ -22,8 +22,6 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-DUSE_KMOD"; NIX_CFLAGS_COMPILE = "-DUSE_KMOD";
preConfigure = '' preConfigure = ''
sed -i 's|/usr|/|' Makefile
# Remove blanket -Werror. Fails for minor error on gcc-11. # Remove blanket -Werror. Fails for minor error on gcc-11.
substituteInPlace usr/Makefile --replace ' -Werror ' ' ' substituteInPlace usr/Makefile --replace ' -Werror ' ' '
''; '';
@ -32,11 +30,12 @@ stdenv.mkDerivation rec {
makeFlags = [ makeFlags = [
"INSTALL=install" "INSTALL=install"
"SED=sed" "SED=sed"
"prefix=/"
"manprefix=/share"
]; ];
installFlags = [ installFlags = [
"install" "install"
"install_systemd"
]; ];
postInstall = '' postInstall = ''