diff options
| author | Shea Levy <shea@shealevy.com> | 2014-10-10 11:40:00 -0400 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2014-10-10 11:40:00 -0400 |
| commit | af4455d853a7ad3be047c2df64cbf6a651c68036 (patch) | |
| tree | 0fe1e4f4763e40cda724be1f2e5c3d166e1a9cdb /pkgs/os-specific/linux | |
| parent | 058bf4ccc407e80c943715bec7f73d71fba28c3c (diff) | |
| parent | c5f4d996fc066a4946c514b68763eb6bdf235c25 (diff) | |
| download | nixlib-af4455d853a7ad3be047c2df64cbf6a651c68036.tar nixlib-af4455d853a7ad3be047c2df64cbf6a651c68036.tar.gz nixlib-af4455d853a7ad3be047c2df64cbf6a651c68036.tar.bz2 nixlib-af4455d853a7ad3be047c2df64cbf6a651c68036.tar.lz nixlib-af4455d853a7ad3be047c2df64cbf6a651c68036.tar.xz nixlib-af4455d853a7ad3be047c2df64cbf6a651c68036.tar.zst nixlib-af4455d853a7ad3be047c2df64cbf6a651c68036.zip | |
Merge branch 'master' of github.com:ip1981/nixpkgs
Fixes for atool & sysstat
Diffstat (limited to 'pkgs/os-specific/linux')
| -rw-r--r-- | pkgs/os-specific/linux/sysstat/default.nix | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/pkgs/os-specific/linux/sysstat/default.nix b/pkgs/os-specific/linux/sysstat/default.nix index 7944f612fb05..69940ceb1328 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 = { |