nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-01 15:11:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:ip1981/nixpkgs

Browse Source 
Fixes for atool & sysstat
This commit is contained in:
Shea Levy 2014-10-10 11:40:00 -04:00
commit af4455d853
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/os-specific/linux/sysstat/default.nix
View File

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

3
pkgs/tools/archivers/atool/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, perl}:
{stdenv, fetchurl, perl, bash}:
stdenv.mkDerivation rec {
name = "atool-0.39.0";
@ -8,6 +8,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [ perl ];
configureScript = "${bash}/bin/bash configure";
meta = {
homepage = http://www.nongnu.org/atool;