From b50a73cab36ccda779d7609ca9391b72ed636137 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 3 Jan 2015 17:53:50 -0800
Subject: [PATCH] samba: Fixes for build and paths

---
 pkgs/servers/samba/4.x.nix      | 1 +
 pkgs/top-level/all-packages.nix | 1 +
 2 files changed, 2 insertions(+)

diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix
index 99d88c728a3..1ecbdf097b3 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 872af609e67..ffa6d86d55b 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;