From 34a00e28dafe753e3f756d28fa3ab86f24517382 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 18 Nov 2011 17:41:21 +0000
Subject: * On FreeBSD, bash is usually installed in /usr/local.

svn path=/nixpkgs/trunk/; revision=30467
---
 pkgs/stdenv/native/default.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'pkgs/stdenv/native')

diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix
index 1f2117ebba0f2..88b3c17b582b5 100644
--- a/pkgs/stdenv/native/default.nix
+++ b/pkgs/stdenv/native/default.nix
@@ -1,10 +1,14 @@
-{system, allPackages ? import ../../..}:
+{ system, allPackages ? import ../../.. }:
 
 rec {
 
-  shell = "/bin/bash";
+  shell = 
+    if system == "i686-freebsd" || system == "x86_64-freebsd" 
+    then "/usr/local/bin/bash"
+    else "/bin/bash";
 
-  path = (if system == "i386-sunos" then [ "/usr/gnu" ] else []) ++
+  path = 
+    (if system == "i386-sunos" then [ "/usr/gnu" ] else []) ++
     (if system == "i686-netbsd" then [ "/usr/pkg" ] else []) ++
     ["/" "/usr" "/usr/local"];
 
@@ -88,6 +92,7 @@ rec {
       preHook =
         if system == "i686-darwin" || system == "powerpc-darwin" || system == "x86_64-darwin" then prehookDarwin else
         if system == "i686-freebsd" then prehookFreeBSD else
+        if system == "x86_64-freebsd" then prehookFreeBSD else
         if system == "i686-openbsd" then prehookOpenBSD else
 	if system == "i686-netbsd" then prehookNetBSD else
         prehookBase;
-- 
cgit 1.4.1