* Add bzip2 to the stdenv.

svn path=/nixpkgs/trunk/; revision=475
This commit is contained in:
Eelco Dolstra 2003-11-04 08:36:32 +00:00
parent 1fdba43460
commit 28f764f991
5 changed files with 15 additions and 40 deletions

View File

@ -3,19 +3,7 @@
system = bootStdenv.system; system = bootStdenv.system;
prehook = ./prehook.sh; prehook = ./prehook.sh;
posthook = ./posthook.sh; posthook = ./posthook.sh;
initialPath = [ initialPath = (import ../nix/path.fix) {pkgs = pkgs};
pkgs.coreutils
pkgs.findutils
pkgs.diffutils
pkgs.gnused
pkgs.gnugrep
pkgs.gawk
pkgs.gnutar
pkgs.gzip
pkgs.binutils
pkgs.gnumake
pkgs.gcc
];
param1 = pkgs.bash; param1 = pkgs.bash;
param2 = pkgs.gcc; param2 = pkgs.gcc;
param3 = pkgs.binutils; param3 = pkgs.binutils;

View File

@ -3,19 +3,7 @@
system = bootStdenv.system; system = bootStdenv.system;
prehook = ./prehook.sh; prehook = ./prehook.sh;
posthook = ./posthook.sh; posthook = ./posthook.sh;
initialPath = [ initialPath = (import ./path.fix) {pkgs = pkgs};
pkgs.coreutils
pkgs.findutils
pkgs.diffutils
pkgs.gnused
pkgs.gnugrep
pkgs.gawk
pkgs.gnutar
pkgs.gzip
pkgs.binutils
pkgs.gnumake
pkgs.gcc
];
param1 = pkgs.bash; param1 = pkgs.bash;
param2 = pkgs.gcc; param2 = pkgs.gcc;
param3 = pkgs.binutils; param3 = pkgs.binutils;

View File

@ -4,8 +4,6 @@
{system, stdenv}: rec { {system, stdenv}: rec {
subversion = "./xxxxxxxxxxxxxx/y/z/a/b/c/d/e/ffffffffffffffffffffff";
### BUILD SUPPORT ### BUILD SUPPORT
fetchurl = (import ../build-support/fetchurl) { fetchurl = (import ../build-support/fetchurl) {
@ -115,7 +113,7 @@
### APPLICATIONS ### APPLICATIONS
/* subversion = (import ../applications/version-management/subversion) { subversion = (import ../applications/version-management/subversion) {
fetchurl = fetchurl; fetchurl = fetchurl;
stdenv = stdenv; stdenv = stdenv;
localServer = false; localServer = false;
@ -128,6 +126,6 @@
libxml2 = ""; libxml2 = "";
expat = ""; expat = "";
swig = ""; swig = "";
}; */ };
} }

View File

@ -12,6 +12,7 @@
# management user interface. # management user interface.
selectedPkgs = [ selectedPkgs = [
pkgs.aterm pkgs.aterm
# pkgs.subversion
]; ];
# Create a user environment. # Create a user environment.

View File

@ -1,10 +1,10 @@
{stdenv, fetchurl}: derivation {stdenv, fetchurl}: derivation {
{ name = "bzip2-1.0.2" name = "bzip2-1.0.2";
, system = stdenv.system system = stdenv.system;
, builder = ./builder.sh builder = ./builder.sh;
, src = fetchurl src = fetchurl {
{ url = ftp://sources.redhat.com/pub/bzip2/v102/bzip2-1.0.2.tar.gz url = ftp://sources.redhat.com/pub/bzip2/v102/bzip2-1.0.2.tar.gz;
, md5 = "ee76864958d568677f03db8afad92beb" md5 = "ee76864958d568677f03db8afad92beb";
} };
, stdenv = stdenv stdenv = stdenv;
} }