diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-01-03 17:53:50 -0800 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-01-03 21:45:16 -0800 |
| commit | b50a73cab36ccda779d7609ca9391b72ed636137 (patch) | |
| tree | b1cec11927b8c26ab3448a3800e67d31724e7e73 | |
| parent | 8ec82fcb18cb909164710f71298164dcb5fb6ea2 (diff) | |
| download | nixlib-b50a73cab36ccda779d7609ca9391b72ed636137.tar nixlib-b50a73cab36ccda779d7609ca9391b72ed636137.tar.gz nixlib-b50a73cab36ccda779d7609ca9391b72ed636137.tar.bz2 nixlib-b50a73cab36ccda779d7609ca9391b72ed636137.tar.lz nixlib-b50a73cab36ccda779d7609ca9391b72ed636137.tar.xz nixlib-b50a73cab36ccda779d7609ca9391b72ed636137.tar.zst nixlib-b50a73cab36ccda779d7609ca9391b72ed636137.zip | |
samba: Fixes for build and paths
| -rw-r--r-- | pkgs/servers/samba/4.x.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 99d88c728a3c..1ecbdf097b3b 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -83,6 +83,7 @@ stdenv.mkDerivation rec { ++ (if glusterfs != null then [ "--enable-glusterfs" ] else [ "--disable-glusterfs" ]) ++ [ # dynconfig/wscript options "--enable-fhs" + "--sysconfdir=/etc" "--localstatedir=/var" # buildtools/wafsamba/wscript options diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 872af609e67c..ffa6d86d55b2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7908,6 +7908,7 @@ let pythonPackages = python2Packages; libiconv = if stdenv.isLinux then null else libiconv; libgcrypt = libgcrypt_1_6; + glusterfs = null; # Broken in the current build }; samba = samba4; |