diff options
| author | Rob Vermaas <rob.vermaas@gmail.com> | 2014-12-18 14:47:00 +0100 |
|---|---|---|
| committer | Rob Vermaas <rob.vermaas@gmail.com> | 2014-12-18 14:47:22 +0100 |
| commit | d05bb6c8c2a26d600aec43a28a3394ac61a5784f (patch) | |
| tree | 8c2bfb1304d8acd037465985b19e43d042459d93 /pkgs/os-specific/linux/sysstat | |
| parent | bf0f2adbebabd20c3ccec57c2427815d2312249d (diff) | |
| download | nixpkgs-d05bb6c8c2a26d600aec43a28a3394ac61a5784f.tar nixpkgs-d05bb6c8c2a26d600aec43a28a3394ac61a5784f.tar.gz nixpkgs-d05bb6c8c2a26d600aec43a28a3394ac61a5784f.tar.bz2 nixpkgs-d05bb6c8c2a26d600aec43a28a3394ac61a5784f.tar.lz nixpkgs-d05bb6c8c2a26d600aec43a28a3394ac61a5784f.tar.xz nixpkgs-d05bb6c8c2a26d600aec43a28a3394ac61a5784f.tar.zst nixpkgs-d05bb6c8c2a26d600aec43a28a3394ac61a5784f.zip | |
Fix sysstat build.
(cherry picked from commit 597007f8b7cf60d4571b859adb3972292e2fa0ff)
Diffstat (limited to 'pkgs/os-specific/linux/sysstat')
| -rw-r--r-- | pkgs/os-specific/linux/sysstat/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/sysstat/install.patch | 13 |
2 files changed, 18 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/sysstat/default.nix b/pkgs/os-specific/linux/sysstat/default.nix index 1547157571c..28d6f0b21a8 100644 --- a/pkgs/os-specific/linux/sysstat/default.nix +++ b/pkgs/os-specific/linux/sysstat/default.nix @@ -1,5 +1,4 @@ { stdenv, fetchurl, gettext, bzip2 }: - stdenv.mkDerivation rec { name = "sysstat-11.0.2"; @@ -15,10 +14,13 @@ stdenv.mkDerivation rec { export PATH_CHKCONFIG=/no-such-program export BZIP=${bzip2}/bin/bzip2 export SYSTEMCTL=systemctl - makeFlagsArray=(DESTDIR=$out SYSCONFIG_DIR=$out/etc IGNORE_MAN_GROUP=y CHOWN=true) - installTargets="install_base install_nls install_man" ''; + makeFlags = "SYSCONFIG_DIR=$(out)/etc IGNORE_MAN_GROUP=y CHOWN=true"; + installTargets = "install_base install_nls install_man"; + + patches = [ ./install.patch ]; + meta = { homepage = http://sebastien.godard.pagesperso-orange.fr/; description = "A collection of performance monitoring tools for Linux (such as sar, iostat and pidstat)"; diff --git a/pkgs/os-specific/linux/sysstat/install.patch b/pkgs/os-specific/linux/sysstat/install.patch new file mode 100644 index 00000000000..473fa30b98b --- /dev/null +++ b/pkgs/os-specific/linux/sysstat/install.patch @@ -0,0 +1,13 @@ +diff -rc sysstat-11.0.1/Makefile.in sysstat-11.0.1-new/Makefile.in +*** sysstat-11.0.1/Makefile.in 2014-08-30 15:38:39.000000000 +0200 +--- sysstat-11.0.1-new/Makefile.in 2014-12-18 14:40:45.466349009 +0100 +*************** +*** 331,337 **** + install_base: all sa1 sa2 sysstat.sysconfig install_man install_nls \ + contrib/isag/isag + mkdir -p $(DESTDIR)$(SA_LIB_DIR) +- mkdir -p $(DESTDIR)$(SA_DIR) + ifeq ($(CLEAN_SA_DIR),y) + find $(DESTDIR)$(SA_DIR) \( -name 'sar??' -o -name 'sa??' -o -name 'sar??.gz' -o -name 'sa??.gz' \) \ + -exec rm -f {} \; +--- 331,336 ---- |