public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #59795 from jacereda/samba-darwin

Browse Source 
samba: fix darwin build
This commit is contained in:
Matthew Bauer 2019-06-10 21:30:59 -04:00 committed by GitHub
commit 3db2fc56ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/servers/samba/4.x.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, python, pkgconfig, perl, libxslt, docbook_xsl { lib, stdenv, fetchurl, python, pkgconfig, perl, libxslt, docbook_xsl, rpcgen
, fetchpatch , fetchpatch, fixDarwinDylibNames
, docbook_xml_dtd_42, readline , docbook_xml_dtd_42, readline
, popt, iniparser, libbsd, libarchive, libiconv, gettext , popt, iniparser, libbsd, libarchive, libiconv, gettext
, krb5Full, zlib, openldap, cups, pam, avahi, acl, libaio, fam, libceph, glusterfs , krb5Full, zlib, openldap, cups, pam, avahi, acl, libaio, fam, libceph, glusterfs
@ -36,6 +36,8 @@ stdenv.mkDerivation rec {
./4.x-fix-makeflags-parsing.patch ./4.x-fix-makeflags-parsing.patch
]; ];
nativeBuildInputs = optionals stdenv.isDarwin [ rpcgen fixDarwinDylibNames ];
buildInputs = buildInputs =
[ python pkgconfig perl libxslt docbook_xsl docbook_xml_dtd_42 /* [ python pkgconfig perl libxslt docbook_xsl docbook_xml_dtd_42 /*
docbook_xml_dtd_45 */ readline popt iniparser jansson 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 sed -i "s,\(XML_CATALOG_FILES=\"\),\1$XML_CATALOG_FILES ,g" buildtools/wafsamba/wafsamba.py
patchShebangs ./buildtools/bin patchShebangs ./buildtools/bin
'' + optionalString stdenv.isDarwin ''
substituteInPlace libcli/dns/wscript_build \
--replace "bld.SAMBA_BINARY('resolvconftest'" "True or bld.SAMBA_BINARY('resolvconftest'"
''; '';
configureFlags = configureFlags =
@ -70,6 +75,7 @@ stdenv.mkDerivation rec {
"--enable-fhs" "--enable-fhs"
"--sysconfdir=/etc" "--sysconfdir=/etc"
"--localstatedir=/var" "--localstatedir=/var"
"--disable-rpath"
] ]
++ [(if enableDomainController ++ [(if enableDomainController
then "--with-experimental-mit-ad-dc" then "--with-experimental-mit-ad-dc"

1
pkgs/top-level/all-packages.nix
View File

@ -14705,6 +14705,7 @@ in
samba3 = callPackage ../servers/samba/3.x.nix { }; samba3 = callPackage ../servers/samba/3.x.nix { };
samba4 = callPackage ../servers/samba/4.x.nix { samba4 = callPackage ../servers/samba/4.x.nix {
rpcgen = netbsd.rpcgen;
python = python3; python = python3;
}; };