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

samba: Fixes for build and paths

Browse Source
This commit is contained in:
William A. Kennington III 2015-01-03 17:53:50 -08:00
parent 8ec82fcb18
commit b50a73cab3
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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

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

@ -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;