alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Fix sysstat build.

Browse source 
(cherry picked from commit 597007f8b7)
This commit is contained in:
Rob Vermaas 2014-12-18 14:47:00 +01:00
parent bf0f2adbeb
commit d05bb6c8c2
2 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/os-specific/linux/sysstat/default.nix
View file

@ -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)";

13
pkgs/os-specific/linux/sysstat/install.patch Normal file
View file

@ -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 ----