3
0
Fork 0
forked from mirrors/nixpkgs
nixpkgs/pkgs/data
aszlig 625d7b9043
Merge pull request #1928 from 'cross-win-osx'.
This includes a lot of fixes for cross-building to Windows and Mac OS X
and could possibly fix things even for non-cross-builds, like for
example OpenSSL on Windows.

The main reason for merging this in 14.04 already is that we already
have runInWindowsVM in master and it doesn't work until we actually
cross-build Cygwin's setup binary as the upstream version is a fast
moving target which gets _overwritten_ on every new release.

Conflicts:
	pkgs/top-level/all-packages.nix
2014-04-21 10:00:35 +02:00
..
documentation man-pages: Update to 3.64 2014-04-16 18:43:38 +02:00
fonts Merge branch 'pr-wqy' of git://github.com/PkmX/nixpkgs 2014-03-15 13:22:31 -04:00
icons hicolor_icon_theme: minor update 0.12 -> 0.13 2013-12-28 15:08:47 +01:00
misc tzdata: Provide lib as an additional output. 2014-03-12 10:00:44 +01:00
sgml+xml docbook5_xsl: update from 1.75.2 to 1.78.1 2014-04-09 12:41:10 +02:00