diff --git a/pkgs/os-specific/linux/sysstat/default.nix b/pkgs/os-specific/linux/sysstat/default.nix index 7944f612fb0..69940ceb132 100644 --- a/pkgs/os-specific/linux/sysstat/default.nix +++ b/pkgs/os-specific/linux/sysstat/default.nix @@ -15,14 +15,8 @@ stdenv.mkDerivation rec { export PATH_CHKCONFIG=/no-such-program export BZIP=${bzip2}/bin/bzip2 export SYSTEMCTL=systemctl - makeFlagsArray=(SYSCONFIG_DIR=$out/etc CHOWN=true IGNORE_MAN_GROUP=y CHOWN=true) - installFlagsArray=(SA_DIR=$TMPDIR/dummy) - # Note: --enable-install-cron actually installs systemd units. - configureFlagsArray+=(--with-systemdsystemunitdir=$out/lib/systemd/system --enable-install-cron) - ''; - - preInstall = '' - mkdir -p $out/lib/systemd/system + makeFlagsArray=(DESTDIR=$out SYSCONFIG_DIR=$out/etc IGNORE_MAN_GROUP=y CHOWN=true) + installTargets="install_base install_nls install_man" ''; meta = { diff --git a/pkgs/tools/archivers/atool/default.nix b/pkgs/tools/archivers/atool/default.nix index 1db7a7a42eb..7e2934a8f88 100644 --- a/pkgs/tools/archivers/atool/default.nix +++ b/pkgs/tools/archivers/atool/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, perl}: +{stdenv, fetchurl, perl, bash}: stdenv.mkDerivation rec { name = "atool-0.39.0"; @@ -8,6 +8,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ perl ]; + configureScript = "${bash}/bin/bash configure"; meta = { homepage = http://www.nongnu.org/atool;