diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-12-06 18:59:07 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-12-06 18:59:07 +0000 |
commit | c4d731f52b0cf29e10f89e418bf68b5a9cca061f (patch) | |
tree | 9839eeec0c66e99804cba51e74a2657abdd0bebf | |
parent | 9bd9e32aa859d58f6d2dafa51ef53ac99710bab3 (diff) | |
download | nixlib-c4d731f52b0cf29e10f89e418bf68b5a9cca061f.tar nixlib-c4d731f52b0cf29e10f89e418bf68b5a9cca061f.tar.gz nixlib-c4d731f52b0cf29e10f89e418bf68b5a9cca061f.tar.bz2 nixlib-c4d731f52b0cf29e10f89e418bf68b5a9cca061f.tar.lz nixlib-c4d731f52b0cf29e10f89e418bf68b5a9cca061f.tar.xz nixlib-c4d731f52b0cf29e10f89e418bf68b5a9cca061f.tar.zst nixlib-c4d731f52b0cf29e10f89e418bf68b5a9cca061f.zip |
* Samba updated to 3.5.6. Build with --localstatedir=/var to prevent
smbd from writing in $out/var at runtime. Also added --with-fhs. svn path=/nixpkgs/trunk/; revision=25015
-rw-r--r-- | pkgs/servers/samba/default.nix | 40 |
1 files changed, 25 insertions, 15 deletions
diff --git a/pkgs/servers/samba/default.nix b/pkgs/servers/samba/default.nix index 31db36c638a7..af29fdb8d9f9 100644 --- a/pkgs/servers/samba/default.nix +++ b/pkgs/servers/samba/default.nix @@ -13,39 +13,49 @@ , configDir ? "/etc/samba" }: + let - usewith = flag: option: if flag then "--with-"+option else ""; + + useWith = flag: option: if flag then "--with-"+option else ""; + in + stdenv.mkDerivation rec { - name = "samba-3.3.3"; + name = "samba-3.5.6"; src = fetchurl { url = "http://us3.samba.org/samba/ftp/stable/${name}.tar.gz"; - sha256 = "08x3ng7ls5c1a95v7djx362i55wdlmnvarpr7rhng5bb55s9n5qn"; + sha256 = "1nj78bahph9fwxv0v3lz31cy6z167jgmvz63d8l9mlbmhf310r26"; }; - buildInputs = [readline pam openldap popt iniparser libunwind fam acl] + buildInputs = [ readline pam openldap popt iniparser libunwind fam acl ] ++ stdenv.lib.optional useKerberos kerberos; - preConfigure = "cd source"; + preConfigure = "cd source3"; - postInstall = '' - mkdir -pv $out/lib/cups/backend - ln -sv ../../../bin/smbspool $out/lib/cups/backend/smb - '' + stdenv.lib.optionalString (configDir == "") "touch $out/lib/smb.conf"; - - # Don't pass --with-private-dir=/var/samba/private - # --with-lockdir=/var/samba/lock - # the build system will try to create it. configureFlags = '' --with-pam --with-cifsmount --with-aio-support --with-pam_smbpass --disable-swat - --enable-shared-libs --with-configdir=${configDir} - ${usewith winbind "winbind"} + --with-fhs + --localstatedir=/var + ${useWith winbind "winbind"} ${if stdenv.gcc.libc != null then "--with-libiconv=${stdenv.gcc.libc}" else ""} ''; + + # Need to use a DESTDIR because `make install' tries to write in /var and /etc. + installFlags = "DESTDIR=$(TMPDIR)/inst"; + + postInstall = + '' + mkdir -p $out + mv $TMPDIR/inst/$out/* $out/ + + mkdir -pv $out/lib/cups/backend + ln -sv ../../../bin/smbspool $out/lib/cups/backend/smb + '' # */ + + stdenv.lib.optionalString (configDir == "") "touch $out/lib/smb.conf"; } |