diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2021-06-21 07:11:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-21 07:11:43 +0200 |
| commit | 7c2d15627a3012c5e5af1d1664a53599687cf1d1 (patch) | |
| tree | 16775dcacc98885168ccedce58534c83ec3d829b /pkgs/os-specific/linux/zfs | |
| parent | 57ac5534e2ee904e7469d9a4fe43eba1a019b658 (diff) | |
| parent | a4cb90bdbd57eabb7ff93d179e687873ac3fafcb (diff) | |
| download | nixpkgs-7c2d15627a3012c5e5af1d1664a53599687cf1d1.tar nixpkgs-7c2d15627a3012c5e5af1d1664a53599687cf1d1.tar.gz nixpkgs-7c2d15627a3012c5e5af1d1664a53599687cf1d1.tar.bz2 nixpkgs-7c2d15627a3012c5e5af1d1664a53599687cf1d1.tar.lz nixpkgs-7c2d15627a3012c5e5af1d1664a53599687cf1d1.tar.xz nixpkgs-7c2d15627a3012c5e5af1d1664a53599687cf1d1.tar.zst nixpkgs-7c2d15627a3012c5e5af1d1664a53599687cf1d1.zip | |
Merge pull request #92378 from jnetod/zfs-smb-share-fix
zfs: patch client path used in smb share
Diffstat (limited to 'pkgs/os-specific/linux/zfs')
| -rw-r--r-- | pkgs/os-specific/linux/zfs/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 303fe62adfd..20a6aedf9c6 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -6,7 +6,7 @@ # Userspace dependencies , zlib, libuuid, python3, attr, openssl , libtirpc -, nfs-utils +, nfs-utils, samba , gawk, gnugrep, gnused, systemd , smartmontools, enableMail ? false , sysstat, pkg-config @@ -55,6 +55,7 @@ let # And if it's enabled by default, only change that if we explicitly disable python to remove python from the closure nfs-utils.override (old: { enablePython = old.enablePython or true && enablePython; }) }/bin/exportfs" + substituteInPlace ./lib/libshare/smb.h --replace "/usr/bin/net" "${samba}/bin/net" substituteInPlace ./config/user-systemd.m4 --replace "/usr/lib/modules-load.d" "$out/etc/modules-load.d" substituteInPlace ./config/zfs-build.m4 --replace "\$sysconfdir/init.d" "$out/etc/init.d" \ --replace "/etc/default" "$out/etc/default" |