summary refs log tree commit diff
path: root/pkgs/os-specific/linux/zfs
diff options
context:
space:
mode:
authorjnetod <49963580+jnetod@users.noreply.github.com>2020-07-05 18:09:46 -0300
committerJ. Neto <jnetod@tuta.io>2021-06-08 23:44:34 -0300
commite16e51702b9df803d172e7bdb4cbb4976778eee2 (patch)
treead12291daaf69ec20ad7d704c69ad979619b61e8 /pkgs/os-specific/linux/zfs
parentc86cd65e9ba49a6e8c4595da9ee27d6ff8ed561b (diff)
downloadnixpkgs-e16e51702b9df803d172e7bdb4cbb4976778eee2.tar
nixpkgs-e16e51702b9df803d172e7bdb4cbb4976778eee2.tar.gz
nixpkgs-e16e51702b9df803d172e7bdb4cbb4976778eee2.tar.bz2
nixpkgs-e16e51702b9df803d172e7bdb4cbb4976778eee2.tar.lz
nixpkgs-e16e51702b9df803d172e7bdb4cbb4976778eee2.tar.xz
nixpkgs-e16e51702b9df803d172e7bdb4cbb4976778eee2.tar.zst
nixpkgs-e16e51702b9df803d172e7bdb4cbb4976778eee2.zip
zfs: patch client path used in smb share
fix zfs smb share integration

before:

# zfs share tank/smb_share
cannot share tank/smb_share: smb add share failed

now works as intended.
Diffstat (limited to 'pkgs/os-specific/linux/zfs')
-rw-r--r--pkgs/os-specific/linux/zfs/default.nix3
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 e41ae3bece2..75f5dcd0e31 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"