Commit graph

9065 commits

Author SHA1 Message Date
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
Peter Simons 486e7736df Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/tools/networking/p2p/amule/default.nix
2013-12-10 00:25:54 +01:00
Vladimír Čunát 5acb97b972 libopus: update 1.0.3 -> 1.1, enable tests 2013-12-09 21:07:56 +01:00
Nixpkgs Monitor 7375a3f7dd aprutil: update from 1.5.2 to 1.5.3 2013-12-09 10:48:41 +02:00
Michael Raskin 4d33a94fae Passing giflib 4.1.x to OpenSceneGraph for now 2013-12-08 13:20:07 +04:00
Lluís Batlle i Rossell c46d5ed3d7 Noting faac unfree. I think it is unfree, not LGPL. 2013-12-07 23:03:42 +01:00
Evgeny Egorochkin 8c5c4eab54 libgdiplus: fix build against giflib 5.* 2013-12-07 14:34:52 +02:00
Nixpkgs Monitor 2ce67ca947 giflib: update from 4.2.3 to 5.0.5 2013-12-07 13:13:06 +02:00
Michael Raskin 14a0050829 Merge pull request #1319 from wkennington/ntrack
Fix ntrack for latest libnl release
2013-12-07 00:12:46 -08:00
William A. Kennington III 2079bfdc58 Fix ntrack for latest libnl release 2013-12-07 01:38:02 -06:00
Lluís Batlle i Rossell 142298495e Fixing the Ultrastardx build. Not tested if it works and how. 2013-12-07 00:07:35 +01:00
Peter Simons 65d33fda95 aterm: mark version 2.8 as broken 2013-12-06 19:31:03 +01:00
Michael Raskin 990d9684a4 Merge pull request #1321 from wkennington/mumble
Break mumble into client and server components
2013-12-04 20:56:36 -08:00
Michael Raskin 8095dce441 Merge pull request #1327 from AndersonTorres/master
Adding Portuguese language dictionary for Aspell
2013-12-04 20:55:57 -08:00
AndersonTorres 9c60834b23 Adding support for Portuguese language for Aspell 2013-12-05 02:22:47 +01:00
Lluís Batlle i Rossell ad90f2f0b8 Adding ffmpeg 2.x 2013-12-04 21:04:30 +01:00
Peter Simons 614544b439 haskell-src: clean out the obsolete happy parser that's included in the distribution tarball 2013-12-04 18:41:18 +01:00
Peter Simons c32bf83301 Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/development/interpreters/perl/5.16/default.nix
	pkgs/tools/networking/curl/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/release-python.nix
	pkgs/top-level/release-small.nix
	pkgs/top-level/release.nix
2013-12-04 18:33:52 +01:00
Evgeny Egorochkin 92dc41142a phonon: update to 4.7.0 2013-12-04 16:56:39 +02:00
Evgeny Egorochkin 7d6fec63c6 giflib: fix documentation 2013-12-04 16:56:18 +02:00
Nixpkgs Monitor ed616385cf heimdal: update from 1.5.2 to 1.5.3 2013-12-04 15:17:42 +02:00
Nixpkgs Monitor 3ac7543bc8 eigen2: update from 2.0.16 to 2.0.17 2013-12-04 15:17:42 +02:00
Nixpkgs Monitor ecfb89101c eigen: update from 3.1.2 to 3.2.0 2013-12-04 15:17:42 +02:00
Nixpkgs Monitor 883022f625 libusb1: update from 1.0.16 to 1.0.17 2013-12-04 15:17:41 +02:00
Nixpkgs Monitor abc2a6950a gpgme: update from 1.4.1 to 1.4.3 2013-12-04 15:17:41 +02:00
Nixpkgs Monitor 054516a0a7 phonon_backend_gstreamer: update from 4.6.3 to 4.7.0 2013-12-04 09:37:22 +02:00
Nixpkgs Monitor 86f7aec950 phonon_backend_vlc: update from 0.5.0 to 0.7.0, potentially fixes CVE-2012-1775, CVE-2012-1776, CVE-2012-3377 2013-12-04 09:37:22 +02:00
Nixpkgs Monitor 83496b02b4 grantlee: update from 0.3.0 to 0.4.0 2013-12-04 06:58:25 +02:00
Nixpkgs Monitor ad14c262f2 avahi: update from 0.6.30 to 0.6.31 2013-12-04 06:56:57 +02:00
Nixpkgs Monitor 56aa0d9e68 giflib: update from 4.1.6 to 4.2.3 2013-12-04 06:56:04 +02:00
Nixpkgs Monitor 0a4855a337 soprano: update from 2.9.3 to 2.9.4 2013-12-04 06:51:56 +02:00
Nixpkgs Monitor c80d5a9f11 lv2: update from 1.4.0 to 1.6.0 2013-12-04 06:42:55 +02:00
Nixpkgs Monitor 7c5e25ab1a openbabel: update from 2.3.1 to 2.3.2 2013-12-04 06:36:16 +02:00
Nixpkgs Monitor 3a1225f8a1 libsecret: update from 0.15 to 0.16 2013-12-04 06:34:34 +02:00
Nixpkgs Monitor bec4483d27 libofx: update from 0.9.4 to 0.9.9 2013-12-04 06:33:25 +02:00
Nixpkgs Monitor db20b093ea libgpod: update from 0.8.2 to 0.8.3 2013-12-04 06:32:32 +02:00
Nixpkgs Monitor 4566b55dae lensfun: update from 0.2.5 to 0.2.7 2013-12-04 06:31:25 +02:00
Nixpkgs Monitor ded642275f cln: update from 1.3.1 to 1.3.3 2013-12-04 06:28:54 +02:00
Nixpkgs Monitor 027003079b libcue: update from 1.3.0 to 1.4.0 2013-12-04 06:25:05 +02:00
Nixpkgs Monitor d1fc8ec866 libnetfilter_conntrack: update from 1.0.2 to 1.0.4, potentially fixes CVE-2012-2671 2013-12-04 05:39:21 +02:00
Nixpkgs Monitor 13f98c6e40 libestr: update from 0.1.4 to 0.1.9 2013-12-04 05:05:56 +02:00
Nixpkgs Monitor 407c0be935 unixODBC: update from 2.3.1 to 2.3.2, potentially fixes CVE-2012-2657, CVE-2012-2658 2013-12-04 04:58:50 +02:00
Nixpkgs Monitor a0c425144e libxmlxx: update from 2.30.0 to 2.30.1 2013-12-04 03:39:08 +02:00
Nixpkgs Monitor 135920b2eb libtorrentRasterbar: update from 0.16.8 to 0.16.12 2013-12-04 03:35:41 +02:00
Nixpkgs Monitor 9a67a50210 libinfinity: update from 0.5.3 to 0.5.4 2013-12-04 03:33:33 +02:00
Peter Simons 342e71ba92 haskell-src-exts: clean out the obsolete happy parser that's included in the distribution tarball 2013-12-04 00:15:24 +01:00
Peter Simons 3c181313e6 haskell-src-exts: drop obsolete version 1.13.5 2013-12-04 00:08:08 +01:00
Peter Simons ad09a97845 haskell-data-pprint: jailbreak to support GHC 7.7 or later 2013-12-03 22:52:05 +01:00
Peter Simons faa56cc801 haskell-zeromq3-haskell: update to version 0.5.1 2013-12-03 22:23:22 +01:00
Peter Simons 7c6d83c550 haskell-tasty: update to version 0.4.1.1 2013-12-03 22:23:22 +01:00