BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* Call all the stdenvs "stdenv" (rather than e.g. "stdenv-linux")

Browse source 
so that "nix-env -i stdenv" does the expected.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31742
This commit is contained in:
Eelco Dolstra 2012-01-20 16:47:54 +00:00
parent 25e0ae0f39
commit 94c7bec49d
4 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/stdenv/generic/default.nix
View file

@ -1,4 +1,4 @@
{ system, name, preHook ? "", initialPath, gcc, shell { system, name ? "stdenv", preHook ? "", initialPath, gcc, shell
, extraAttrs ? {}, overrides ? (pkgs: {}) , extraAttrs ? {}, overrides ? (pkgs: {})
, # The `fetchurl' to use for downloading curl and its dependencies , # The `fetchurl' to use for downloading curl and its dependencies

2
pkgs/stdenv/linux/default.nix
View file

@ -260,8 +260,6 @@ rec {
# dependency (`nix-store -qR') on bootstrapTools or the # dependency (`nix-store -qR') on bootstrapTools or the
# first binutils built. # first binutils built.
stdenvLinux = import ../generic rec { stdenvLinux = import ../generic rec {
name = "stdenv-linux";
inherit system; inherit system;
preHook = commonPreHook; preHook = commonPreHook;

2
pkgs/stdenv/native/default.nix
View file

@ -86,8 +86,6 @@ rec {
{ gcc, fetchurl, extraPath ? [], overrides ? (pkgs: { }) }: { gcc, fetchurl, extraPath ? [], overrides ? (pkgs: { }) }:
import ../generic { import ../generic {
name = "stdenv-native";
preHook = preHook =
if system == "i686-darwin" || system == "powerpc-darwin" || system == "x86_64-darwin" then prehookDarwin else if system == "i686-darwin" || system == "powerpc-darwin" || system == "x86_64-darwin" then prehookDarwin else
if system == "i686-freebsd" then prehookFreeBSD else if system == "i686-freebsd" then prehookFreeBSD else

2
pkgs/stdenv/nix/default.nix
View file

@ -1,8 +1,6 @@
{ stdenv, pkgs }: { stdenv, pkgs }:
import ../generic rec { import ../generic rec {
name = "stdenv-nix";
preHook = preHook =
'' ''
export NIX_ENFORCE_PURITY=1 export NIX_ENFORCE_PURITY=1