diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-01-20 16:47:54 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-01-20 16:47:54 +0000 |
| commit | 94c7bec49dd0be92b10ae62967e11855cfa52d07 (patch) | |
| tree | 94efcea4b99bdc10a48d58ac6e5b25302a04baaf /pkgs/stdenv | |
| parent | 25e0ae0f39e97b6986eccd1ffb7f3b31507e8f0f (diff) | |
| download | nixlib-94c7bec49dd0be92b10ae62967e11855cfa52d07.tar nixlib-94c7bec49dd0be92b10ae62967e11855cfa52d07.tar.gz nixlib-94c7bec49dd0be92b10ae62967e11855cfa52d07.tar.bz2 nixlib-94c7bec49dd0be92b10ae62967e11855cfa52d07.tar.lz nixlib-94c7bec49dd0be92b10ae62967e11855cfa52d07.tar.xz nixlib-94c7bec49dd0be92b10ae62967e11855cfa52d07.tar.zst nixlib-94c7bec49dd0be92b10ae62967e11855cfa52d07.zip | |
* Call all the stdenvs "stdenv" (rather than e.g. "stdenv-linux")
so that "nix-env -i stdenv" does the expected. svn path=/nixpkgs/branches/stdenv-updates/; revision=31742
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/generic/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/stdenv/linux/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/stdenv/native/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/stdenv/nix/default.nix | 2 |
4 files changed, 1 insertions, 7 deletions
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 91e6af01578f..a20ebda4bad4 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -1,4 +1,4 @@ -{ system, name, preHook ? "", initialPath, gcc, shell +{ system, name ? "stdenv", preHook ? "", initialPath, gcc, shell , extraAttrs ? {}, overrides ? (pkgs: {}) , # The `fetchurl' to use for downloading curl and its dependencies diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 4fa9df8ddee4..4a63d0bf95a2 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -260,8 +260,6 @@ rec { # dependency (`nix-store -qR') on bootstrapTools or the # first binutils built. stdenvLinux = import ../generic rec { - name = "stdenv-linux"; - inherit system; preHook = commonPreHook; diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix index 28f077aa8ef8..c0da8f2b0c19 100644 --- a/pkgs/stdenv/native/default.nix +++ b/pkgs/stdenv/native/default.nix @@ -86,8 +86,6 @@ rec { { gcc, fetchurl, extraPath ? [], overrides ? (pkgs: { }) }: import ../generic { - name = "stdenv-native"; - preHook = if system == "i686-darwin" || system == "powerpc-darwin" || system == "x86_64-darwin" then prehookDarwin else if system == "i686-freebsd" then prehookFreeBSD else diff --git a/pkgs/stdenv/nix/default.nix b/pkgs/stdenv/nix/default.nix index 7eac06500032..473bb5af0afd 100644 --- a/pkgs/stdenv/nix/default.nix +++ b/pkgs/stdenv/nix/default.nix @@ -1,8 +1,6 @@ { stdenv, pkgs }: import ../generic rec { - name = "stdenv-nix"; - preHook = '' export NIX_ENFORCE_PURITY=1 |