diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-11-18 17:41:21 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-11-18 17:41:21 +0000 |
| commit | 34a00e28dafe753e3f756d28fa3ab86f24517382 (patch) | |
| tree | 4f1d2424013e7608e6cf1482a1d8b0ef266e7008 /pkgs/stdenv/native | |
| parent | 13551f95b520143537b6d2d464b4754812a4aea3 (diff) | |
* On FreeBSD, bash is usually installed in /usr/local.
svn path=/nixpkgs/trunk/; revision=30467
Diffstat (limited to 'pkgs/stdenv/native')
| -rw-r--r-- | pkgs/stdenv/native/default.nix | 11 |
1 files changed, 8 insertions, 3 deletions
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; |