pyrox.dev / nixpkgs
lol
fork atom

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

Fixes for atool & sysstat

Shea Levy af4455d8 058bf4cc

+4 -9
unified split
+2 -8
pkgs/os-specific/linux/sysstat/default.nix
··· 15 15 export PATH_CHKCONFIG=/no-such-program 16 16 export BZIP=${bzip2}/bin/bzip2 17 17 export SYSTEMCTL=systemctl 18 - makeFlagsArray=(SYSCONFIG_DIR=$out/etc CHOWN=true IGNORE_MAN_GROUP=y CHOWN=true) 19 - installFlagsArray=(SA_DIR=$TMPDIR/dummy) 20 - # Note: --enable-install-cron actually installs systemd units. 21 - configureFlagsArray+=(--with-systemdsystemunitdir=$out/lib/systemd/system --enable-install-cron) 22 - ''; 23 - 24 - preInstall = '' 25 - mkdir -p $out/lib/systemd/system 18 + makeFlagsArray=(DESTDIR=$out SYSCONFIG_DIR=$out/etc IGNORE_MAN_GROUP=y CHOWN=true) 19 + installTargets="install_base install_nls install_man" 26 20 ''; 27 21 28 22 meta = {
+2 -1
pkgs/tools/archivers/atool/default.nix
··· 1 - {stdenv, fetchurl, perl}: 1 + {stdenv, fetchurl, perl, bash}: 2 2 3 3 stdenv.mkDerivation rec { 4 4 name = "atool-0.39.0"; ··· 8 8 }; 9 9 10 10 buildInputs = [ perl ]; 11 + configureScript = "${bash}/bin/bash configure"; 11 12 12 13 meta = { 13 14 homepage = http://www.nongnu.org/atool;