* 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
This commit is contained in:
parent
25e0ae0f39
commit
94c7bec49d
|
@ -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
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -1,8 +1,6 @@
|
|||
{ stdenv, pkgs }:
|
||||
|
||||
import ../generic rec {
|
||||
name = "stdenv-nix";
|
||||
|
||||
preHook =
|
||||
''
|
||||
export NIX_ENFORCE_PURITY=1
|
||||
|
|
Loading…
Reference in a new issue