From 7193e07cba7a272941a44440afddf4833a735e89 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 4 Apr 2015 22:11:45 -0700 Subject: [PATCH] bareos: Remove install hack --- pkgs/tools/backup/bareos/default.nix | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/backup/bareos/default.nix b/pkgs/tools/backup/bareos/default.nix index c375937ba241..55c84a1015f6 100644 --- a/pkgs/tools/backup/bareos/default.nix +++ b/pkgs/tools/backup/bareos/default.nix @@ -33,7 +33,6 @@ stdenv.mkDerivation rec { configureFlags = [ "--sysconfdir=/etc" - "--localstatedir=/var" "--exec-prefix=\${out}" "--enable-lockmgr" "--enable-dynamic-storage-backends" @@ -62,17 +61,11 @@ stdenv.mkDerivation rec { ++ optional (glusterfs != null) "--with-glusterfs=${glusterfs}" ++ optional (ceph != null) "--with-cephfs=${ceph}"; - installFlags = [ "DESTDIR=\${out}" ]; - - postInstall = '' - mv $out/$out/* $out - DIR=$out/$out - while rmdir $DIR 2>/dev/null; do - DIR="$(dirname "$DIR")" - done - - rm -rf /tmp /var - ''; + installFlags = [ + "sysconfdir=\${out}/etc" + "working_dir=\${TMPDIR}" + "log_dir=\${TMPDIR}" + ]; meta = with stdenv.lib; { homepage = http://www.bareos.org/;