Merge branch 'master' of github.com:ip1981/nixpkgs
Fixes for atool & sysstat
This commit is contained in:
commit
af4455d853
@ -15,14 +15,8 @@ stdenv.mkDerivation rec {
|
|||||||
export PATH_CHKCONFIG=/no-such-program
|
export PATH_CHKCONFIG=/no-such-program
|
||||||
export BZIP=${bzip2}/bin/bzip2
|
export BZIP=${bzip2}/bin/bzip2
|
||||||
export SYSTEMCTL=systemctl
|
export SYSTEMCTL=systemctl
|
||||||
makeFlagsArray=(SYSCONFIG_DIR=$out/etc CHOWN=true IGNORE_MAN_GROUP=y CHOWN=true)
|
makeFlagsArray=(DESTDIR=$out SYSCONFIG_DIR=$out/etc IGNORE_MAN_GROUP=y CHOWN=true)
|
||||||
installFlagsArray=(SA_DIR=$TMPDIR/dummy)
|
installTargets="install_base install_nls install_man"
|
||||||
# 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
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{stdenv, fetchurl, perl}:
|
{stdenv, fetchurl, perl, bash}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "atool-0.39.0";
|
name = "atool-0.39.0";
|
||||||
@ -8,6 +8,7 @@ stdenv.mkDerivation rec {
|
|||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ perl ];
|
buildInputs = [ perl ];
|
||||||
|
configureScript = "${bash}/bin/bash configure";
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = http://www.nongnu.org/atool;
|
homepage = http://www.nongnu.org/atool;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user