Commit Graph

44 Commits

Author SHA1 Message Date
Vladimír Čunát
267d0a5ab6 Merge #1633: --enable-symlinks in ncurses and e2fsprogs 2014-04-02 19:05:56 +02:00
Vladimír Čunát
cb639302df Merge glibc-2.18 branch into stdenv-updates
It's to separate from other changes coming from master.

Conflicts:
	pkgs/development/libraries/glibc/2.18/common.nix (taking both changes)
	pkgs/development/libraries/ncurses/5_4.nix (deleted)
2013-12-28 18:51:23 +01:00
Bjørn Forsman
2b2c55e34a ncurses: add ncurses5-config -> ncursesw5-config symlink
We already have backward compatibility symlinks for ncurses libraries
and pkg-config files (when built in unicode/wide mode). The last bit is
to add a symlink from ncurses5-config to ncursesw5-config, which is what
this commit does.
2013-12-26 18:51:48 +01:00
Bjørn Forsman
50253a3e84 ncurses: install *.pc files (for pkg-config)
To make e.g. "pkg-config --cflags ncursesw" work.

The ncurses expression, when built in unicode/wide char mode, provides
backward compatibility symlinks from lib<name>.so to lib<name>w.so.
Provide similar symlinks for the *.pc files: <name>.pc -> <name>w.pc.
2013-12-26 18:31:24 +01:00
Eelco Dolstra
dc5cc7cfb3 ncurses: Remove version 5.4
It's not used anywhere, and doesn't build:

http://hydra.nixos.org/build/7204910
2013-12-20 14:48:19 +01:00
Bjørn Forsman
3227c1d215 ncurses: fix includedir setting
${out} in configureFlags isn't expanded, so ncursesw5-config ends up
expanding ${out} at *runtime*. Here is the relevant ncursesw5-config
snippet showing how includedir gets its value at runtime.

  bindir="${exec_prefix}/bin"
  includedir="${out}/include"
  libdir="${exec_prefix}/lib"
  datadir="${prefix}/share"
  mandir="${prefix}/man"

When running in a plain shell you get this:
  $ ncursesw5-config --cflags
  -I/include/ncursesw -I/include

And when run in a nix-build shell for e.g. gpsd:
  $ ncursesw5-config --cflags
  -I/nix/store/HASH-gpsd-3.10/include/ncursesw -I/nix/store/HASH-gpsd-3.10/include

This is clearly wrong.

Q: How come this has gone undetected for years?
A: It seems few packages use ncursesw5-config to get the compiler
flags. For example, our python curses module builds its own compiler
flags.

Fix this by moving the --includedir setting to preConfigure where shell
variables are expanded.
2013-12-10 19:47:52 +01:00
Vladimír Čunát
8ba92b8895 Merge master into stdenv-updates
Conflicts (simple):
	pkgs/development/tools/misc/binutils/default.nix
	pkgs/tools/package-management/disnix/default.nix
	pkgs/top-level/all-packages.nix
2013-07-08 10:48:05 +02:00
Jason \"Don\" O'Conal
f5a130b6b3 newsbeuter: add expression 2013-07-04 19:17:07 +02:00
Gergely Risko
8326038d2b Add ncursesw compatibility link also for includes
This is needed for the ncurses cabal package to compile.  It uses
include/ncursesw/curses.h, without trying include/curses.h first.  The
files are provided through include/ncursesw on a clean Debian too, in
the unicode case (when the libncursesw5-dev is installed).

Signed-off-by: Domen Kozar <domen@dev.si>
2013-05-27 18:16:00 +02:00
Danny Wilson
99a14f378c Fix ncurses build on Illumos. 2013-02-28 20:04:05 +01:00
Eelco Dolstra
ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
2012-12-28 19:20:09 +01:00
Ludovic Courtès
29bc53265d Darwin: Use GCC 4.6 in `stdenvNix'.
svn path=/nixpkgs/trunk/; revision=33894
2012-04-23 15:47:37 +00:00
Yury G. Kudryashov
f99db36748 Remove unused patch
Ncurses does not reference this patch since r32728.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32793
2012-03-05 10:00:57 +00:00
Ludovic Courtès
0b6223cff2 GNU Ncurses: Remove patch that no longer applies.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32728
2012-03-01 21:48:25 +00:00
Eelco Dolstra
eda3fd1730 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=30852
2011-12-12 16:54:35 +00:00
Eelco Dolstra
5abed12234 * i386-sunos -> i686-solaris.
svn path=/nixpkgs/trunk/; revision=30507
2011-11-21 14:11:04 +00:00
Ludovic Courtès
3e8b08d2fc GNU Ncurses 5.9.
svn path=/nixpkgs/branches/stdenv-updates/; revision=29587
2011-10-02 20:35:44 +00:00
Ludovic Courtès
ec042dad00 GNU Ncurses: Fix C++-less builds.
svn path=/nixpkgs/trunk/; revision=25649
2011-01-20 23:32:09 +00:00
Ludovic Courtès
11679ebe4b GNU Ncurses: Attempt to fix Solaris builds.
svn path=/nixpkgs/trunk/; revision=25594
2011-01-17 09:16:30 +00:00
Lluís Batlle i Rossell
61e9f9cede Cross-building ncursesw was not that easy; it needed this patch, at least for
the current nixpkgs (gcc, glibc)

svn path=/nixpkgs/branches/stdenv-updates/; revision=24246
2010-10-12 19:39:30 +00:00
Peter Simons
aec027e2ec pkgs/development/libraries/ncurses: enable parallel building for ncurses
svn path=/nixpkgs/branches/stdenv-updates/; revision=22674
2010-07-20 13:14:03 +00:00
Rob Vermaas
0ef1853275 because i was too lazy, now the real reason: if I don't do this, mercurial fails to run on darwin
svn path=/nixpkgs/trunk/; revision=20645
2010-03-16 10:52:12 +00:00
Rob Vermaas
541beebe6f libncurses: on darwin systems remove .so files
svn path=/nixpkgs/trunk/; revision=20644
2010-03-16 10:37:41 +00:00
Armijn Hemel
6a503c7d61 remove GNUism
svn path=/nixpkgs/branches/stdenv-updates/; revision=19505
2010-01-17 22:08:22 +00:00
Armijn Hemel
aec137add1 remove GNUism
svn path=/nixpkgs/branches/stdenv-updates/; revision=19504
2010-01-17 21:52:11 +00:00
Lluís Batlle i Rossell
45886e474d On native builds:
- Disabling guile test, because one fails. I commented on that in the source.
On cross builds:
- Adding stripping
- Updating the glibc-2.11 expression to match the parameters of glibc-2.9,
  which I was updating more.
- Renaming from selfNativeBuildInput to selfBuildNativeInput, so this matches
  better the pattern buildNativeInputs.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18550
2009-11-22 22:48:43 +00:00
Lluís Batlle i Rossell
28d9e73d34 Adding a new mkDerivation flag for the cross stdenv, selfNativeBuildInput =
true/false, which tells whether the derivation needs itself as
buildNativeInput.
For example, in order to build cross ncurses, we need the a native build
ncurses.
(As libtool does not work in stdenv, I have not tested this change, to check
whether finally ncurses cross-build)


svn path=/nixpkgs/branches/stdenv-updates/; revision=18489
2009-11-20 16:38:01 +00:00
Eelco Dolstra
f7ad184041 * ncurses: don't do make check because it doesn't have one.
svn path=/nixpkgs/branches/stdenv-updates/; revision=13804
2009-01-19 11:01:20 +00:00
Ludovic Courtès
28b96c18c7 GNU Ncurses 5.7.
Untested!

svn path=/nixpkgs/branches/stdenv-updates/; revision=13185
2008-11-04 09:03:05 +00:00
Eelco Dolstra
e33f6df6fa * Test whether "libcursesw" actually exists before symlinking to it.
(Does it ever exist?)

svn path=/nixpkgs/trunk/; revision=12710
2008-08-25 15:29:04 +00:00
Michael Raskin
8ea6496a10 -
svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10823
2008-02-22 03:06:12 +00:00
Eelco Dolstra
544cb9cb83 * Rewrite all URLs to GNU mirrors to mirror://gnu/.
svn path=/nixpkgs/trunk/; revision=9201
2007-08-27 13:42:00 +00:00
Michael Raskin
68d6762e0f I hope I disabled ncursesw in Cygwin. Also fixed device-mapper mention in system.nix. Also added pam in the list of sudo dependencies, it should be done anyway, but still only NOPASSWD entries work.
svn path=/nixpkgs/trunk/; revision=8931
2007-06-28 22:14:25 +00:00
Yury G. Kudryashov
40657fbece * ncurses: added symlinks for bynary packages linked against libncurses. Tested
with ghc. I will add 'unicode' option next check in (for cygwin).
* pidgin:  Got rid of builder.sh, added ncurses to the dependencies, so it builds
           finch.
* xorg:    Added glproto and mesaHeaders to xf86videosis dependencies. Now it
           compiles.
* pwgen:   Added.
* device-mapper: Version bump. Added 'static' option for use in initrd.
* lvm2:          Version bump. Added 'static' option for use in initrd.

svn path=/nixpkgs/trunk/; revision=8923
2007-06-28 09:53:12 +00:00
Yury G. Kudryashov
4512585cd5 * ncurses: builder removed, building ncursesw instead of ncurses (source-compatible).
svn path=/nixpkgs/trunk/; revision=8919
2007-06-26 11:34:05 +00:00
Armijn Hemel
7e41b751cb new versions of various very important tools to keep the buildfarm busy.
svn path=/nixpkgs/trunk/; revision=7485
2006-12-25 23:28:35 +00:00
Eelco Dolstra
1442e8ec22 * Copy a bunch of files to nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=6711
2006-10-12 13:50:54 +00:00
Eelco Dolstra
ffb94e0690 * Latest versions.
svn path=/nixpkgs/trunk/; revision=5482
2006-06-21 15:54:46 +00:00
Eelco Dolstra
bdabd66a46 * Install ncurses header files in $out/include, not
$out/include/ncurses.  This simplifies many builders.

svn path=/nixpkgs/trunk/; revision=4008
2005-10-04 14:24:19 +00:00
Eelco Dolstra
454707da23 * catamaran.labs.cs.uu.nl -> nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=3660
2005-08-22 08:39:27 +00:00
Eelco Dolstra
e42507d182 * Move tarballs to catamaran so that we are no longer dependent on a
gazillion different servers.  Resurrected some 25 missing files.

svn path=/nixpkgs/trunk/; revision=2237
2005-02-15 14:44:19 +00:00
Eelco Dolstra
4fc3dd4a5a * Remove builder.
svn path=/nixpkgs/trunk/; revision=877
2004-03-30 12:35:56 +00:00
Eelco Dolstra
12ae5363ea * Remove trivial builders.
* Make builders unexecutable by removing the hash-bang line and
  execute permission.
* Convert calls to `derivation' to `mkDerivation'.
* Remove `system' and `stdenv' attributes from calls to
  `mkDerivation'.  These transformations were all done automatically,
  so it is quite possible I broke stuff.
* Put the `mkDerivation' function in stdenv/generic.

svn path=/nixpkgs/trunk/; revision=874
2004-03-29 17:23:01 +00:00
Eelco Dolstra
287edecf42 * Added gperf, texinfo, ncurses.
* Started moving the gcc wrapper stuff out of stdenv.
* Added octavefront and rna.

svn path=/nixpkgs/trunk/; revision=814
2004-03-05 10:13:23 +00:00