From 0635f1640fd1038c0143c8361ef8c41c3f184974 Mon Sep 17 00:00:00 2001 From: Igor Pashev Date: Thu, 9 Oct 2014 20:48:23 +0400 Subject: [PATCH 1/2] atool's configure script uses bashizm MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit if test "${startperl:0:1}" = "#" ; then startperl="\\$startperl" fi This results in an error: checking for perl... /nix/store/6qvjjaywj6qf8jn9splpiz9qap01w36w-perl-5.16.3/bin/perl ./configure: 2264: ./configure.lineno: Bad substitution builder for ‘/nix/store/nk9y51xlzsbkhswc5cpl3hkryg2xw85g-atool-0.39.0.drv’ failed with exit code 2 --- pkgs/tools/archivers/atool/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/archivers/atool/default.nix b/pkgs/tools/archivers/atool/default.nix index 1db7a7a42ebc..7e2934a8f88a 100644 --- a/pkgs/tools/archivers/atool/default.nix +++ b/pkgs/tools/archivers/atool/default.nix @@ -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; From c5f4d996fc066a4946c514b68763eb6bdf235c25 Mon Sep 17 00:00:00 2001 From: Igor Pashev Date: Thu, 9 Oct 2014 21:45:43 +0400 Subject: [PATCH 2/2] Fixed buidling sysstat https://github.com/NixOS/nixpkgs/issues/4441 --- pkgs/os-specific/linux/sysstat/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/os-specific/linux/sysstat/default.nix b/pkgs/os-specific/linux/sysstat/default.nix index 7944f612fb05..69940ceb1328 100644 --- a/pkgs/os-specific/linux/sysstat/default.nix +++ b/pkgs/os-specific/linux/sysstat/default.nix @@ -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 = {