summary refs log tree commit diff
path: root/pkgs/servers/samba
diff options
context:
space:
mode:
authorWanja Zaeske <wanja.zaeske@dlr.de>2023-01-02 10:41:12 +0100
committerwucke13 <wucke13@gmail.com>2023-01-15 22:22:06 +0100
commit9b4cf10855256ba9d78c04c28dc43b27a4b4acf4 (patch)
tree9aad9ec36f23d5c8f3a9d02a31fb0033512b387a /pkgs/servers/samba
parenta36d319f2d85aa7eec06051e6d5b524ad2e66781 (diff)
samba: etc
Makes samba use the nix vendored `talloc` instead of compiling its own,
bundleded version. This fixes an issue where the library may be initialized
with different magic numbers, resulting in segfaults. See in
https://github.com/NixOS/nixpkgs/issues/205859 for further detail.
Diffstat (limited to 'pkgs/servers/samba')
-rw-r--r--pkgs/servers/samba/4.x.nix7
1 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix
index df235abe98c4b..6853c385317b0 100644
--- a/pkgs/servers/samba/4.x.nix
+++ b/pkgs/servers/samba/4.x.nix
@@ -20,9 +20,12 @@
 , gnutls
 , systemd
 , samba
+, talloc
 , jansson
+, ldb
 , libtasn1
 , tdb
+, tevent
 , libxcrypt
 , cmocka
 , rpcsvc-proto
@@ -100,8 +103,11 @@ stdenv.mkDerivation rec {
     libarchive
     zlib
     gnutls
+    ldb
+    talloc
     libtasn1
     tdb
+    tevent
     libxcrypt
   ] ++ optionals stdenv.isLinux [ liburing systemd ]
     ++ optionals stdenv.isDarwin [ libiconv ]
@@ -143,6 +149,7 @@ stdenv.mkDerivation rec {
   ++ optionals (!enableLDAP) [
     "--without-ldap"
     "--without-ads"
+    "--bundled-libraries=!ldb,!pyldb-util!talloc,!pytalloc-util,!tevent,!tdb,!pytdb"
   ] ++ optional enableLibunwind "--with-libunwind"
     ++ optional enableProfiling "--with-profiling-data"
     ++ optional (!enableAcl) "--without-acl-support"