summary refs log tree commit diff
path: root/pkgs/os-specific/linux/sysstat/default.nix
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-09-23 11:51:34 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-09-23 11:51:46 +0200
commitcae28df8fa3c5d135ddfb2461c24fe0db7fb0d2a (patch)
tree17f37336c06c395d9745faeceb5be1ecfc4df2ef /pkgs/os-specific/linux/sysstat/default.nix
parentdad76237584b0a7bd29761c99989b9ce7700c573 (diff)
downloadnixpkgs-cae28df8fa3c5d135ddfb2461c24fe0db7fb0d2a.tar
nixpkgs-cae28df8fa3c5d135ddfb2461c24fe0db7fb0d2a.tar.gz
nixpkgs-cae28df8fa3c5d135ddfb2461c24fe0db7fb0d2a.tar.bz2
nixpkgs-cae28df8fa3c5d135ddfb2461c24fe0db7fb0d2a.tar.lz
nixpkgs-cae28df8fa3c5d135ddfb2461c24fe0db7fb0d2a.tar.xz
nixpkgs-cae28df8fa3c5d135ddfb2461c24fe0db7fb0d2a.tar.zst
nixpkgs-cae28df8fa3c5d135ddfb2461c24fe0db7fb0d2a.zip
sysstat: Update to 11.0.1 and install systemd units
Diffstat (limited to 'pkgs/os-specific/linux/sysstat/default.nix')
-rw-r--r--pkgs/os-specific/linux/sysstat/default.nix23
1 files changed, 15 insertions, 8 deletions
diff --git a/pkgs/os-specific/linux/sysstat/default.nix b/pkgs/os-specific/linux/sysstat/default.nix
index ec504bd9235..7944f612fb0 100644
--- a/pkgs/os-specific/linux/sysstat/default.nix
+++ b/pkgs/os-specific/linux/sysstat/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, gettext }:
-   
+{ stdenv, fetchurl, gettext, bzip2 }:
+
 stdenv.mkDerivation rec {
-  name = "sysstat-10.1.1";
-   
+  name = "sysstat-11.0.1";
+
   src = fetchurl {
-    url = "http://perso.orange.fr/sebastien.godard/${name}.tar.bz2";
-    sha256 = "1ig6k4yjkkazddjr90hykiapl30s9r9c1gy1h8hqzn2c3xgkm7p3";
+    url = "http://perso.orange.fr/sebastien.godard/${name}.tar.xz";
+    sha256 = "1cwgsxvs7jkr3il6r344mw46502yjnhrsbcp4217vh4b7xv6czaq";
   };
 
   buildInputs = [ gettext ];
@@ -13,10 +13,17 @@ stdenv.mkDerivation rec {
   preConfigure = ''
     export PATH_CP=$(type -tp cp)
     export PATH_CHKCONFIG=/no-such-program
-    makeFlagsArray=(SA_DIR=/var/log/sa SYSCONFIG_DIR=$out/etc CHOWN=true IGNORE_MAN_GROUP=y)
+    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)
   '';
 
-  patches = [ ./no-install-statedir.patch ];
+  preInstall = ''
+    mkdir -p $out/lib/systemd/system
+  '';
 
   meta = {
     homepage = http://sebastien.godard.pagesperso-orange.fr/;