* Finally got stdenv-nix-linux working again. Still not perfect,

though.
* libxml2: upgrade to latest.
* octavefront/rna: keep debug info.

svn path=/nixpkgs/trunk/; revision=830
This commit is contained in:
Eelco Dolstra
2004-03-11 17:26:14 +00:00
parent a1b3ae0c81
commit de13527000
34 changed files with 162 additions and 131 deletions
+2 -2
View File
@@ -5,7 +5,7 @@ buildinputs="$binutils"
tar xvfj $src
if test "$enforcePurity" = "1"; then
if test "$noSysDirs" = "1"; then
# Disable the standard include directories.
cd gcc-*
cat >> ./gcc/cppdefault.h <<EOF
@@ -29,7 +29,7 @@ mkdir build
cd build
../gcc-*/configure --prefix=$out --enable-languages="$langs"
if test "$enforcePurity" = "1"; then
if test "$noSysDirs" = "1"; then
# Patch some of the makefiles to force linking against our own glibc.
. $NIX_GCC/nix-support/add-flags # add glibc/gcc flags
extraflags="-Wl,-s $NIX_CFLAGS_COMPILE $NIX_CFLAGS_LINK"
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, enforcePurity ? true
{ stdenv, fetchurl, noSysDirs
, langC ? true, langCC ? true, langF77 ? false
}:
@@ -16,5 +16,5 @@ derivation {
# url = ftp://ftp.nluug.nl/mirror/languages/gcc/releases/gcc-3.3.3/gcc-3.3.3.tar.bz2;
# md5 = "3c6cfd9fcd180481063b4058cf6faff2";
# };
inherit stdenv enforcePurity langC langCC langF77;
inherit stdenv noSysDirs langC langCC langF77;
}