From 6310a9a3be5da3c410526abfc87369846536588a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 31 Jul 2015 04:13:08 +0200 Subject: [PATCH] gnum4: Fix impurity in shell handling If gnum4 is built outside of a chroot, it will decide to use /run/current-system/sw/bin/sh as the shell for "syscmd". (It gets this path via "getconf PATH". Maybe our Glibc shouldn't return that path, at least not during Nix builds...) If such a build of gnum4 is subsequently used *inside* a chroot, it won't work because /run/current-system doesn't exist. So specify an explicit path to the shell. --- pkgs/development/tools/misc/gnum4/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/gnum4/default.nix b/pkgs/development/tools/misc/gnum4/default.nix index 67688254a40..7174f4b41c3 100644 --- a/pkgs/development/tools/misc/gnum4/default.nix +++ b/pkgs/development/tools/misc/gnum4/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "gnum4-1.4.17"; @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { && !stdenv.isCygwin # XXX: `test-dup2' fails on Cygwin && !stdenv.isSunOS; # XXX: `test-setlocale2.sh' fails + configureFlags = "--with-syscmd-shell=${stdenv.shell}"; + # Upstream is aware of it; it may be in the next release. patches = [ ./s_isdir.patch ];