FreeBSD: undo removal of Solaris and remove changes to native stdenv now that FreeBSD has its own

2 files changed, 1 insertions, 94 deletions

diff --git a/pkgs/development/compilers/sbcl/bootstrap.nix b/pkgs/development/compilers/sbcl/bootstrap.nix
index 4152bb8b2a3f..f8352f0a362e 100644
--- a/pkgs/development/compilers/sbcl/bootstrap.nix
+++ b/pkgs/development/compilers/sbcl/bootstrap.nix
@@ -23,6 +23,7 @@ let
       sha256 = "0sp5445rbvms6qvzhld0kwwvydw51vq5iaf4kdqsf2d9jvaz3yx5";
     };
     armv6l-linux = armv7l-linux;
+    x86_64-solaris = x86_64-linux;
     x86_64-freebsd = rec {
       version = "1.2.7";
       system = "x86-64-freebsd";
diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix
index 93d1c7e971c2..bd90d580d3f5 100644
--- a/pkgs/stdenv/native/default.nix
+++ b/pkgs/stdenv/native/default.nix
@@ -24,100 +24,6 @@ rec {
     alias make=gmake
     alias tar=gtar
     alias sed=gsed
-
-    alias patch=gpatch # pcre relied on this for patching binary files
-
-    # we need GNU cp for --reflink, need to alias all of coreutils
-    alias basename=gbasename
-    alias cat=gcat
-    alias chgrp=gchgrp
-    alias chmod=gchmod
-    alias chown=gchown
-    alias chroot=gchroot
-    alias cksum=gcksum
-    alias comm=gcomm
-    alias cp=gcp
-    alias csplit=gcsplit
-    alias cut=gcut
-    alias date=gdate
-    alias dd=gdd
-    alias df=gdf
-    alias dir=gdir
-    alias dircolors=gdircolors
-    alias dirname=gdirname
-    alias du=gdu
-    alias echo=gecho
-    alias env=genv
-    alias expand=gexpand
-    alias expr=gexpr
-    alias factor=gfactor
-    alias false=gfalse
-    alias fmt=gfmt
-    alias fold=gfold
-    alias groups=ggroups
-    alias head=ghead
-    alias hostid=ghostid
-    alias hostname=ghostname
-    alias id=gid
-    alias install=ginstall
-    alias join=gjoin
-    alias kill=gkill
-    alias link=glink
-    alias ln=gln
-    alias logname=glogname
-    alias ls=gls
-    alias md5sum=gmd5sum
-    alias mkdir=gmkdir
-    alias mkfifo=gmkfifo
-    alias mknod=gmknod
-    alias mv=gmv
-    alias nice=gnice
-    alias nl=gnl
-    alias nohup=gnohup
-    alias od=god
-    alias paste=gpaste
-    alias pathchk=gpathchk
-    alias pinky=gpinky
-    alias pr=gpr
-    alias printenv=gprintenv
-    alias printf=gprintf
-    alias ptx=gptx
-    alias pwd=gpwd
-    alias readlink=greadlink
-    alias rm=grm
-    alias rmdir=grmdir
-    alias seq=gseq
-    alias sha1sum=gsha1sum
-    alias shred=gshred
-    alias sleep=gsleep
-    alias sort=gsort
-    alias split=gsplit
-    alias stat=gstat
-    alias stty=gstty
-    alias su=gsu
-    alias sum=gsum
-    alias sync=gsync
-    alias tac=gtac
-    #alias tail=gtail # this breaks xz XXX
-    alias tee=gtee
-    alias test=gtest
-    alias touch=gtouch
-    alias tr=gtr
-    alias true=gtrue
-    alias tsort=gtsort
-    alias tty=gtty
-    alias uname=guname
-    alias unexpand=gunexpand
-    alias uniq=guniq
-    alias unlink=gunlink
-    alias uptime=guptime
-    alias users=gusers
-    alias vdir=gvdir
-    alias wc=gwc
-    alias who=gwho
-    alias whoami=gwhoami
-    alias yes=gyes
-
     export MAKE=gmake
     shopt -s expand_aliases
   '';