diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-03-08 16:02:46 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-03-08 16:02:46 +0000 |
| commit | ce50734cf067496ae50d1a6fd139fc03de283cbc (patch) | |
| tree | 8603be7a557177d8646093c4edf7bdb097577b11 /pkgs/stdenv/native | |
| parent | 1b8e9faf08d2bb5fe83464d8380dabc52982f935 (diff) | |
| download | nixpkgs-ce50734cf067496ae50d1a6fd139fc03de283cbc.tar nixpkgs-ce50734cf067496ae50d1a6fd139fc03de283cbc.tar.gz nixpkgs-ce50734cf067496ae50d1a6fd139fc03de283cbc.tar.bz2 nixpkgs-ce50734cf067496ae50d1a6fd139fc03de283cbc.tar.lz nixpkgs-ce50734cf067496ae50d1a6fd139fc03de283cbc.tar.xz nixpkgs-ce50734cf067496ae50d1a6fd139fc03de283cbc.tar.zst nixpkgs-ce50734cf067496ae50d1a6fd139fc03de283cbc.zip | |
* Started reorganising stdenv:
- gcc/ld-wrappers have been factored out into a separate
derivation. This allows a working gcc to be installed in the user
environment. (Previously the Nix gcc didn't work because it
needed a whole bunch of flags to point to glibc.)
- Better modularity: packages can specify hooks into the setup
scripts. For instance, setup no longer knows about the
PKG_CONFIG_PATH variable; pkgconfig can set it up instead.
- gcc not longer depends on binutils. This simplifies the bootstrap
process.
svn path=/nixpkgs/trunk/; revision=816
Diffstat (limited to 'pkgs/stdenv/native')
| -rw-r--r-- | pkgs/stdenv/native/default.nix | 24 | ||||
| -rw-r--r-- | pkgs/stdenv/native/prehook.sh | 4 |
2 files changed, 14 insertions, 14 deletions
diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix index 2859cc18d0e..cf5a1da1987 100644 --- a/pkgs/stdenv/native/default.nix +++ b/pkgs/stdenv/native/default.nix @@ -1,13 +1,17 @@ -{system}: (import ../generic) { +{stdenv}: + +(import ../generic) { name = "stdenv-native"; - system = system; - prehook = ./prehook.sh; - posthook = ./posthook.sh; + preHook = ./prehook.sh; + postHook = ./posthook.sh; initialPath = "/usr/local /usr /"; - param1 = ""; - param2 = ""; - param3 = ""; - param4 = ""; - param5 = ""; - noSysDirs = false; + + inherit stdenv; + + gcc = (import ../../build-support/gcc-wrapper) { + inherit stdenv; + name = "gcc-native"; + isNative = true; + gcc = "/usr"; + }; } diff --git a/pkgs/stdenv/native/prehook.sh b/pkgs/stdenv/native/prehook.sh index 72e9c174870..af1ba16ccbe 100644 --- a/pkgs/stdenv/native/prehook.sh +++ b/pkgs/stdenv/native/prehook.sh @@ -1,5 +1 @@ export SHELL=/bin/sh - -export NIX_CC=/usr/bin/gcc -export NIX_CXX=/usr/bin/g++ -export NIX_LD=/usr/bin/ld |