diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2005-10-04 14:24:19 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2005-10-04 14:24:19 +0000 |
| commit | bdabd66a464f87e7f4ab4d2aea9ab36944cf4510 (patch) | |
| tree | db39976f8b0b811cc2e766ad4270858e53be7fe9 /pkgs/development/libraries/libcaca | |
| parent | 5573610e012a4666117851e12c7e8eb4e5aa00c1 (diff) | |
| download | nixlib-bdabd66a464f87e7f4ab4d2aea9ab36944cf4510.tar nixlib-bdabd66a464f87e7f4ab4d2aea9ab36944cf4510.tar.gz nixlib-bdabd66a464f87e7f4ab4d2aea9ab36944cf4510.tar.bz2 nixlib-bdabd66a464f87e7f4ab4d2aea9ab36944cf4510.tar.lz nixlib-bdabd66a464f87e7f4ab4d2aea9ab36944cf4510.tar.xz nixlib-bdabd66a464f87e7f4ab4d2aea9ab36944cf4510.tar.zst nixlib-bdabd66a464f87e7f4ab4d2aea9ab36944cf4510.zip | |
* Install ncurses header files in $out/include, not
$out/include/ncurses. This simplifies many builders. svn path=/nixpkgs/trunk/; revision=4008
Diffstat (limited to 'pkgs/development/libraries/libcaca')
| -rw-r--r-- | pkgs/development/libraries/libcaca/builder.sh | 6 | ||||
| -rw-r--r-- | pkgs/development/libraries/libcaca/default.nix | 3 |
2 files changed, 1 insertions, 8 deletions
diff --git a/pkgs/development/libraries/libcaca/builder.sh b/pkgs/development/libraries/libcaca/builder.sh deleted file mode 100644 index 4c6535a43218..000000000000 --- a/pkgs/development/libraries/libcaca/builder.sh +++ /dev/null @@ -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 diff --git a/pkgs/development/libraries/libcaca/default.nix b/pkgs/development/libraries/libcaca/default.nix index 4c6e80940ad7..118a02a94e66 100644 --- a/pkgs/development/libraries/libcaca/default.nix +++ b/pkgs/development/libraries/libcaca/default.nix @@ -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]; } |