diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-06-10 21:30:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-10 21:30:59 -0400 |
| commit | 3db2fc56ff8d9ac48ac466431de0f7cd55630440 (patch) | |
| tree | 41bb449d1e1a9b3e7b03531f501385041b5ee72e /pkgs/servers/samba | |
| parent | 02698c4a61aaa4eb7cd0569a4802f110d2dd37c8 (diff) | |
| parent | b172ff55e3da70c67d47d7780640ba4c43d7ff27 (diff) | |
| download | nixpkgs-3db2fc56ff8d9ac48ac466431de0f7cd55630440.tar nixpkgs-3db2fc56ff8d9ac48ac466431de0f7cd55630440.tar.gz nixpkgs-3db2fc56ff8d9ac48ac466431de0f7cd55630440.tar.bz2 nixpkgs-3db2fc56ff8d9ac48ac466431de0f7cd55630440.tar.lz nixpkgs-3db2fc56ff8d9ac48ac466431de0f7cd55630440.tar.xz nixpkgs-3db2fc56ff8d9ac48ac466431de0f7cd55630440.tar.zst nixpkgs-3db2fc56ff8d9ac48ac466431de0f7cd55630440.zip | |
Merge pull request #59795 from jacereda/samba-darwin
samba: fix darwin build
Diffstat (limited to 'pkgs/servers/samba')
| -rw-r--r-- | pkgs/servers/samba/4.x.nix | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 0b8a63e63f6..7dcc6cbe686 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchurl, python, pkgconfig, perl, libxslt, docbook_xsl -, fetchpatch +{ lib, stdenv, fetchurl, python, pkgconfig, perl, libxslt, docbook_xsl, rpcgen +, fetchpatch, fixDarwinDylibNames , docbook_xml_dtd_42, readline , popt, iniparser, libbsd, libarchive, libiconv, gettext , krb5Full, zlib, openldap, cups, pam, avahi, acl, libaio, fam, libceph, glusterfs @@ -36,6 +36,8 @@ stdenv.mkDerivation rec { ./4.x-fix-makeflags-parsing.patch ]; + nativeBuildInputs = optionals stdenv.isDarwin [ rpcgen fixDarwinDylibNames ]; + buildInputs = [ python pkgconfig perl libxslt docbook_xsl docbook_xml_dtd_42 /* docbook_xml_dtd_45 */ readline popt iniparser jansson @@ -60,6 +62,9 @@ stdenv.mkDerivation rec { sed -i "s,\(XML_CATALOG_FILES=\"\),\1$XML_CATALOG_FILES ,g" buildtools/wafsamba/wafsamba.py patchShebangs ./buildtools/bin + '' + optionalString stdenv.isDarwin '' + substituteInPlace libcli/dns/wscript_build \ + --replace "bld.SAMBA_BINARY('resolvconftest'" "True or bld.SAMBA_BINARY('resolvconftest'" ''; configureFlags = @@ -70,6 +75,7 @@ stdenv.mkDerivation rec { "--enable-fhs" "--sysconfdir=/etc" "--localstatedir=/var" + "--disable-rpath" ] ++ [(if enableDomainController then "--with-experimental-mit-ad-dc" |