samba: Fixes for build and paths
This commit is contained in:
parent
8ec82fcb18
commit
b50a73cab3
|
@ -83,6 +83,7 @@ stdenv.mkDerivation rec {
|
||||||
++ (if glusterfs != null then [ "--enable-glusterfs" ] else [ "--disable-glusterfs" ]) ++ [
|
++ (if glusterfs != null then [ "--enable-glusterfs" ] else [ "--disable-glusterfs" ]) ++ [
|
||||||
# dynconfig/wscript options
|
# dynconfig/wscript options
|
||||||
"--enable-fhs"
|
"--enable-fhs"
|
||||||
|
"--sysconfdir=/etc"
|
||||||
"--localstatedir=/var"
|
"--localstatedir=/var"
|
||||||
|
|
||||||
# buildtools/wafsamba/wscript options
|
# buildtools/wafsamba/wscript options
|
||||||
|
|
|
@ -7908,6 +7908,7 @@ let
|
||||||
pythonPackages = python2Packages;
|
pythonPackages = python2Packages;
|
||||||
libiconv = if stdenv.isLinux then null else libiconv;
|
libiconv = if stdenv.isLinux then null else libiconv;
|
||||||
libgcrypt = libgcrypt_1_6;
|
libgcrypt = libgcrypt_1_6;
|
||||||
|
glusterfs = null; # Broken in the current build
|
||||||
};
|
};
|
||||||
|
|
||||||
samba = samba4;
|
samba = samba4;
|
||||||
|
|
Loading…
Reference in a new issue