From 6aa8c5761c24a3914fbaa89153fb3adbc9b05de9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 21 Apr 2013 12:06:45 +0200 Subject: [PATCH] guile: fix non-GNU builds --- pkgs/development/interpreters/guile/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index 558f4a8806e..66b5b79083a 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -106,10 +106,8 @@ // -(if stdenv.isFreeBSD - then { - # XXX: Thread support is currently broken on FreeBSD and Solaris (namely - # the `SCM_I_IS_THREAD' assertion in `scm_spawn_thread' is hit.) - configureFlags = [ "--without-threads" ]; - } - else {})) +(stdenv.lib.optionalAttrs (!stdenv.isLinux) { + # Work around . + SHELL = "/bin/sh"; + CONFIG_SHELL = "/bin/sh"; +}))