JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
$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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/editors/nano/builder.sh
View File

@ -1,4 +0,0 @@
. $stdenv/setup
export CFLAGS="$CFLAGS -I$ncurses/include/ncurses"
genericBuild

3
pkgs/applications/editors/nano/default.nix
View File

@ -2,12 +2,9 @@
stdenv.mkDerivation {
name = "nano-1.2.4";
builder = ./builder.sh;
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/nano-1.2.4.tar.gz;
md5 = "2c513310ec5e8b63abaecaf48670ac7a";
};
inherit ncurses;
buildInputs = [ncurses];
}

5
pkgs/applications/networking/browsers/lynx/builder.sh
View File

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

2
pkgs/applications/networking/browsers/lynx/default.nix
View File

@ -6,12 +6,10 @@ assert sslSupport -> openssl != null;
stdenv.mkDerivation {
name = "lynx-2.8.5";
builder = ./builder.sh;
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/lynx2.8.5.tar.bz2;
md5 = "d1e5134e5d175f913c16cb6768bc30eb";
};
inherit ncurses;
configureFlags = (if sslSupport then "--with-ssl" else "");
buildInputs = [ncurses (if sslSupport then openssl else null)];
}

1
pkgs/development/libraries/aalib/builder.sh
View File

@ -1,6 +1,5 @@
source $stdenv/setup
configureFlags="--without-x --with-ncurses=$ncurses"
export NIX_CFLAGS_COMPILE="-I$ncurses/include/ncurses $NIX_CFLAGS_COMPILE"
genericBuild

1
pkgs/development/libraries/aalib/default.nix
View File

@ -7,5 +7,6 @@ stdenv.mkDerivation {
url = http://surfnet.dl.sourceforge.net/sourceforge/aa-project/aalib-1.4rc4.tar.gz;
md5 = "d5aa8e9eae07b7441298b5c30490f6a6";
};
buildInputs = [ncurses];
inherit ncurses;
}

6
pkgs/development/libraries/libcaca/builder.sh
View File

@ -1,6 +0,0 @@
source $stdenv/setup
configureFlags="--disable-x11 --disable-imlib2 --disable-doc"
export NIX_CFLAGS_COMPILE="-I$ncurses/include/ncurses -I$ncurses/include $NIX_CFLAGS_COMPILE"
genericBuild

3
pkgs/development/libraries/libcaca/default.nix
View File

@ -2,11 +2,10 @@
stdenv.mkDerivation {
name = "libcaca-0.9";
builder = ./builder.sh;
src = fetchurl {
url = http://sam.zoy.org/libcaca/libcaca-0.9.tar.bz2;
md5 = "c7d5c46206091a9203fcb214abb25e4a";
};
inherit ncurses;
configureFlags = "--disable-x11 --disable-imlib2 --disable-doc";
propagatedBuildInputs = [ncurses];
}

5
pkgs/development/libraries/ncurses/builder.sh Normal file
View File

@ -0,0 +1,5 @@
source $stdenv/setup
configureFlags="--with-shared --includedir=$out/include"
genericBuild

2
pkgs/development/libraries/ncurses/default.nix
View File

@ -2,9 +2,9 @@
stdenv.mkDerivation {
name = "ncurses-5.4";
builder = ./builder.sh;
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/ncurses-5.4.tar.gz;
md5 = "069c8880072060373290a4fefff43520";
};
configureFlags = "--with-shared";
}

8
pkgs/development/tools/misc/texinfo/builder.sh
View File

@ -1,8 +0,0 @@
buildinputs="$ncurses"
. $stdenv/setup
tar xvfz $src
cd texinfo-*
./configure --prefix=$out
make
make install

11
pkgs/development/tools/misc/texinfo/default.nix
View File

@ -1,13 +1,10 @@
{stdenv, fetchurl, ncurses}:
assert ncurses != null;
stdenv.mkDerivation {
name = "texinfo-4.6";
builder = ./builder.sh;
name = "texinfo-4.8";
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/texinfo-4.6.tar.gz;
md5 = "5730c8c0c7484494cca7a7e2d7459c64";
url = http://ftp.gnu.org/gnu/texinfo/texinfo-4.8.tar.bz2;
md5 = "6ba369bbfe4afaa56122e65b3ee3a68c";
};
inherit ncurses;
buildInputs = [ncurses];
}

5
pkgs/os-specific/linux/alsa/utils/builder.sh
View File

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

2
pkgs/os-specific/linux/alsa/utils/default.nix
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;
}

2
pkgs/os-specific/linux/procps/builder.sh
View File

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

7
pkgs/os-specific/linux/procps/default.nix
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;
}