* Install ncurses header files in $out/include, not

$out/include/ncurses.  This simplifies many builders.

svn path=/nixpkgs/trunk/; revision=4008
This commit is contained in:
Eelco Dolstra
2005-10-04 14:24:19 +00:00
parent 5573610e01
commit bdabd66a46
16 changed files with 15 additions and 52 deletions

View File

@@ -1,5 +0,0 @@
source $stdenv/setup
export NIX_CFLAGS_COMPILE="-I$ncurses/include/ncurses -I$ncurses/include $NIX_CFLAGS_COMPILE"
genericBuild

View File

@@ -2,11 +2,9 @@
stdenv.mkDerivation {
name = "alsa-utils-1.0.9a";
builder = ./builder.sh;
src = fetchurl {
url = ftp://ftp.alsa-project.org/pub/utils/alsa-utils-1.0.9a.tar.bz2;
md5 = "d4b77e9fe0311772293e402fdd634ad2";
};
buildInputs = [alsaLib ncurses gettext];
inherit ncurses;
}

View File

@@ -1,7 +1,5 @@
. $stdenv/setup
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$ncurses/include/ncurses"
export DESTDIR=$out
genericBuild

View File

@@ -1,13 +1,12 @@
{stdenv, fetchurl, ncurses}:
stdenv.mkDerivation {
name = "procps-3.2.4";
name = "procps-3.2.5";
builder = ./builder.sh;
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/procps-3.2.4.tar.gz;
md5 = "1bec6740b385b3f73800827437f14f85";
url = http://procps.sourceforge.net/procps-3.2.5.tar.gz;
md5 = "cde0e3612d1d7c68f404d46f01c44fb4";
};
patches = [./makefile.patch];
buildInputs = [ncurses];
inherit ncurses;
}