diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-12-12 16:54:35 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-12-12 16:54:35 +0000 |
| commit | eda3fd1730cdfe7302ad8891fca7bb09670e37b2 (patch) | |
| tree | 7ca3e75279c237cb10ee9b365b0bc919a5f2eddc /pkgs/stdenv/native | |
| parent | 5de58eb38778eef03e119545b21b2ad48c125482 (diff) | |
| parent | b0834a993ea0daa1a417d7d838764c828cee992c (diff) | |
| download | nixpkgs-eda3fd1730cdfe7302ad8891fca7bb09670e37b2.tar nixpkgs-eda3fd1730cdfe7302ad8891fca7bb09670e37b2.tar.gz nixpkgs-eda3fd1730cdfe7302ad8891fca7bb09670e37b2.tar.bz2 nixpkgs-eda3fd1730cdfe7302ad8891fca7bb09670e37b2.tar.lz nixpkgs-eda3fd1730cdfe7302ad8891fca7bb09670e37b2.tar.xz nixpkgs-eda3fd1730cdfe7302ad8891fca7bb09670e37b2.tar.zst nixpkgs-eda3fd1730cdfe7302ad8891fca7bb09670e37b2.zip | |
* Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=30852
Diffstat (limited to 'pkgs/stdenv/native')
| -rw-r--r-- | pkgs/stdenv/native/default.nix | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix index 6cb45909019..1f3fa69d51b 100644 --- a/pkgs/stdenv/native/default.nix +++ b/pkgs/stdenv/native/default.nix @@ -1,10 +1,13 @@ -{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 == "i686-solaris" then [ "/usr/gnu" ] else []) ++ (if system == "i686-netbsd" then [ "/usr/pkg" ] else []) ++ ["/" "/usr" "/usr/local"]; @@ -87,6 +90,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; @@ -109,7 +113,7 @@ rec { name = "gcc-native"; nativeTools = true; nativeLibc = true; - nativePrefix = if system == "i386-sunos" then "/usr/gnu" else "/usr"; + nativePrefix = if system == "i686-solaris" then "/usr/gnu" else "/usr"; stdenv = stdenvBoot0; }; |