public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added initial OpenBSD support to the stdenv

Browse Source 
svn path=/nixpkgs/trunk/; revision=17362
This commit is contained in:
Sander van der Burg 2009-09-23 13:30:04 +00:00
parent d874ec17a4
commit 4fafee1555
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/stdenv/generic/default.nix
View File

@ -74,7 +74,8 @@ let
|| result.system == "powerpc-linux"; || result.system == "powerpc-linux";
isi686 = result.system == "i686-linux" isi686 = result.system == "i686-linux"
|| result.system == "i686-darwin" || result.system == "i686-darwin"
|| result.system == "i686-freebsd"; || result.system == "i686-freebsd"
|| result.system == "i686-openbsd";
is64bit = result.system == "x86_64-linux"; is64bit = result.system == "x86_64-linux";
# Utility function: allow stdenv to be easily regenerated with # Utility function: allow stdenv to be easily regenerated with

13
pkgs/stdenv/native/default.nix
View File

@ -33,6 +33,18 @@ rec {
export NIX_GCC_NEEDS_GREP=1 export NIX_GCC_NEEDS_GREP=1
''; '';
prehookOpenBSD = builtins.toFile "prehook-openbsd.sh" ''
source ${prehookBase}
alias make=gmake
alias grep=ggrep
export MAKE=gmake
shopt -s expand_aliases
# Filter out stupid GCC warnings (in gcc-wrapper).
export NIX_GCC_NEEDS_GREP=1
'';
prehookCygwin = builtins.toFile "prehook-cygwin.sh" '' prehookCygwin = builtins.toFile "prehook-cygwin.sh" ''
source ${prehookBase} source ${prehookBase}
@ -55,6 +67,7 @@ rec {
preHook = preHook =
if system == "i686-darwin" || system == "powerpc-darwin" then prehookDarwin else if system == "i686-darwin" || system == "powerpc-darwin" then prehookDarwin else
if system == "i686-freebsd" then prehookFreeBSD else if system == "i686-freebsd" then prehookFreeBSD else
if system == "i686-openbsd" then prehookOpenBSD else
prehookBase; prehookBase;
initialPath = extraPath ++ path; initialPath = extraPath ++ path;