1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-25 03:17:13 +00:00
Commit graph

37 commits

Author SHA1 Message Date
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
John Wiegley b18dc38dc1 Patch lua52 to build on Darwin 2014-04-15 04:46:14 -05:00
John Wiegley f9c2f684e8 Allow lua5 to build as a dylib on Darwin 2014-04-14 14:39:23 -05:00
aszlig c7bac81c66
Merge 'mingw-w64' and 'darwin' into cross-win-osx.
Both branches have quite a lot in common, so it's time for a merge and
do the cleanups with respect to both implementations and also generalize
both implementations as much as possible.

This also closes #1876.

Conflicts:
	pkgs/development/interpreters/lua-5/5.2.nix
	pkgs/development/libraries/SDL/default.nix
	pkgs/development/libraries/glew/default.nix
	pkgs/top-level/all-packages.nix
2014-03-12 10:16:51 +01:00
aszlig 745c477930
lua5.2/cross: Fix build for Darwin.
The ld from cctools doesn't like the -soname argument, so let's strip it
off for now until we have a binutils <-> cctools bridge.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-03-12 10:00:46 +01:00
aszlig e64b342fa8
Use mingw-w64 for 32bit Windows builds as well.
Mingw(32) is rather poorly maintaned and has quite a lot of bugs. And
because our Windows cross builds were also poorly maintained and most of
the cross-tests were broken as well, I'm just taking this step and try
to switch to mingw-w64 for everything "cross Windows".

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-03-03 22:38:48 +01:00
aszlig 4f69722ee5
lua52/cross: Allow to cross-compile to mingw-w64.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-02-24 07:26:25 +01:00
Petr Rockai 5383e07e40 lua5: Add the lua-sockets extension. 2014-01-28 21:48:47 +01:00
Michael Raskin 826e7f8a94 Add a LUA_COMPAT_ALL version of Lua 5.2 2014-01-12 22:15:54 +04:00
Bjørn Forsman 083d0890f5 More description fixes
* Remove package name
* Start with upper case letter
* Remove trailing period

Also reword some descriptions and move some long descriptions to
longDescription.

I'm not touching generated packages.
2013-10-06 12:01:38 +02:00
Peter Simons 9c6e0e584c lua-5.1: fix $prefix in installed pkgconfig file 2013-10-03 17:09:02 +02:00
Peter Simons 8e3df6a494 lua: fix issue #1009 2013-09-25 12:29:56 +02:00
Peter Simons b13188dff0 lua-5.2: install missing liblua.so.5.2.2 binary 2013-09-17 11:45:55 +02:00
Peter Simons ad8a921f15 lua-5.1: install missing liblua.so.5.1.5 binary 2013-09-17 11:33:57 +02:00
Peter Simons 9c45b91002 lua-5: update default version from 5.1.4 to 5.1.5 and add version 5.2.2 2013-09-16 11:50:20 +02:00
Peter Simons 5bf938a635 lua-5.1: build liblua.so and install the pkgconfig file and the documentation 2012-12-25 11:25:56 +01:00
Peter Simons a352796e0d lua: add version 5.1
The 5.1 build system doesn't seem to support building a shared object anymore?
2012-10-10 19:24:37 +02:00
Eelco Dolstra c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
2012-01-18 20:16:00 +00:00
Lluís Batlle i Rossell e43bd7c4ce Made lua and task warrior unstable crossbuild fine
svn path=/nixpkgs/trunk/; revision=31251
2012-01-03 19:12:06 +00:00
Peter Simons c9695f2d48 Added obsolete lua-5.0.3 version, which is required by gravit.
svn path=/nixpkgs/trunk/; revision=27692
2011-07-10 14:04:19 +00:00
Lluís Batlle i Rossell e6a787f44a Making lua and boost cross-build.
svn path=/nixpkgs/trunk/; revision=23807
2010-09-15 09:56:06 +00:00
Rob Vermaas d9f435106c lua5: re-enable -fPIC for lua5
svn path=/nixpkgs/trunk/; revision=23668
2010-09-07 12:56:49 +00:00
Peter Simons 08244152cc pkgs/development/interpreters/lua-5: overriding CFLAGS on the make command-line breaks the build
svn path=/nixpkgs/trunk/; revision=23367
2010-08-23 15:20:49 +00:00
Peter Simons 8170f3b73b pkgs/development/interpreters/lua-5: FreeBSD can't handle "install -D"; use "ensureDir" instead
svn path=/nixpkgs/trunk/; revision=23366
2010-08-23 15:09:02 +00:00
Peter Simons c50ae128d5 pkgs/development/interpreters/lua-5: added support for all Unix platforms
svn path=/nixpkgs/trunk/; revision=23362
2010-08-23 14:41:03 +00:00
Peter Simons f79f257c88 pkgs/development/interpreters/lua-5: $makeFlags is not a list
svn path=/nixpkgs/trunk/; revision=23359
2010-08-23 14:29:26 +00:00
Peter Simons a65aab0171 pkgs/development/interpreters/lua-5: cosmetic changes
svn path=/nixpkgs/trunk/; revision=23358
2010-08-23 14:27:33 +00:00
Peter Simons d3a8a3f7d0 pkgs/development/interpreters/lua-5: added meta section to the expression
svn path=/nixpkgs/trunk/; revision=23357
2010-08-23 14:26:26 +00:00
David Guibert 9f77579f41 lua: install lua.pc
svn path=/nixpkgs/trunk/; revision=23049
2010-08-09 06:48:21 +00:00
Lluís Batlle i Rossell 9885a6a4da I did not enable well the -fPIC for lua in my last commit. 2nd attempt, for vlc to build fine.
Making vlc build finally (disabling dbus in it)

svn path=/nixpkgs/trunk/; revision=22415
2010-06-25 18:34:35 +00:00
Lluís Batlle i Rossell 029299e710 Making lua build with -fPIC. This allows building vlc on linux-x86_64.
svn path=/nixpkgs/trunk/; revision=22411
2010-06-24 23:05:15 +00:00
Lluís Batlle i Rossell a6e86e241f Updating lua5.
svn path=/nixpkgs/trunk/; revision=15223
2009-04-21 19:47:20 +00:00
Yury G. Kudryashov 10a1a685a0 lua-5: url correted
svn path=/nixpkgs/trunk/; revision=10331
2008-01-28 19:38:59 +00:00
Yury G. Kudryashov 2d0d0e8fbf * zsh upgraded to 4.3.2, lua upgraded to 5.1.2 (works only on linux now)
svn path=/nixpkgs/trunk/; revision=8990
2007-07-17 16:43:06 +00:00
Eelco Dolstra f861c8b66c * makeFlags -> buildFlags in a few places.
svn path=/nixpkgs/trunk/; revision=7503
2006-12-27 18:34: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
Christof Douma 1fa4c66b73 added version to uuagc
added: noweb, lua-5.x, lua-4.x, mk, qc-- (as qcmm)

svn path=/nixpkgs/trunk/; revision=4681
2006-02-02 17:07:07 +00:00