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

samba: fix darwin build

Browse Source
This commit is contained in:
Jorge Acereda 2019-04-17 22:50:08 +02:00
parent 31726fd9a6
commit 78c018ba8e
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, python, pkgconfig, perl, libxslt, docbook_xsl
{ lib, stdenv, fetchurl, python, pkgconfig, perl, libxslt, docbook_xsl, rpcgen
, fetchpatch
, docbook_xml_dtd_42, readline
, popt, iniparser, libbsd, libarchive, libiconv, gettext
@ -36,6 +36,8 @@ stdenv.mkDerivation rec {
./4.x-fix-makeflags-parsing.patch
];
nativeBuildInputs = optional stdenv.isDarwin rpcgen;
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 =

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

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