Lluís Batlle i Rossell
183d05a0d7
Setting the cmake build type Release in its setup-hook, for all cmake
...
projects to be built in Release by default.
Some packages were not getting optimisation flags, like rigsofrods.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32574
2012-02-26 11:27:45 +00:00
Shea Levy
ea195b2507
svn merge ^/nixpkgs/trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=32564
2012-02-25 19:57:34 +00:00
Lluís Batlle i Rossell
675e16f805
Fixing jam for i686-linux. That should allow building trigger rally.
...
svn path=/nixpkgs/trunk/; revision=32557
2012-02-25 16:47:21 +00:00
Yury G. Kudryashov
38e3d7bc86
svn merge ^/nixpkgs/trunk
...
Not merged r32497 (tree conflict, glibc GNU Hurd update). Ludovic, could you
please look at this?
svn path=/nixpkgs/branches/stdenv-updates/; revision=32520
2012-02-23 20:06:21 +00:00
Yury G. Kudryashov
166e87319c
Fix cmake-2.6.4 build (add xmlrpc-c)
...
svn path=/nixpkgs/trunk/; revision=32505
2012-02-23 11:27:47 +00:00
Yury G. Kudryashov
417124626b
Add cmake-2.6.4
...
This is the minimum version required for KDE-4, so I need it to ensure that my
cmake code works with cmake-2.6.4.
svn path=/nixpkgs/trunk/; revision=32504
2012-02-23 11:27:43 +00:00
Yury G. Kudryashov
215a07c1a9
svn merge ^/nixpkgs/trunk
...
Merge conflicts:
* unzip (almost trivial)
* dvswitch (trivial)
* gmp (copied result of `git merge`)
The last item introduced gmp-5.0.3, thus full rebuild.
+ensureDir->mkdir -p in TeX packages was catched by git but not svn.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32091
2012-02-06 23:03:12 +00:00
Yury G. Kudryashov
71c28d0e33
Use meta.platforms
...
svn path=/nixpkgs/trunk/; revision=31909
2012-01-28 14:39:56 +00:00
Eelco Dolstra
1e886749b5
* Don't replace /opt if it's followed by something other than
...
whitespace or a /, otherwise strings such as /foo/opticaldrive.c
will be broken.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31793
2012-01-23 13:16:51 +00:00
Eelco Dolstra
28780d27d1
* cmake: don't use replace-literal.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=31736
2012-01-20 15:10:28 +00:00
Yury G. Kudryashov
84c0185038
svn merge ^/nixpkgs/trunk, one simple conflict in jruby
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=31721
2012-01-19 21:31:51 +00:00
Yury G. Kudryashov
d0c8b530e9
leiningen: added package version 1.6.2
...
svn path=/nixpkgs/trunk/; revision=31716
2012-01-19 20:34:59 +00: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
Yury G. Kudryashov
29d613ba0e
Add a warning to cmake/default.nix
...
svn path=/nixpkgs/trunk/; revision=31248
2012-01-03 18:00:02 +00:00
Eelco Dolstra
5386b47ead
* Revert. Cmake is still broken on i686-linux.
...
svn path=/nixpkgs/trunk/; revision=31244
2012-01-03 17:22:11 +00:00
Yury G. Kudryashov
71c6de7338
cmake-2.8.7
...
svn path=/nixpkgs/trunk/; revision=31241
2012-01-03 16:38:53 +00:00
Eelco Dolstra
bb889c3605
* Revert both r30278 (cmake upgrade) and r30307 (zlib fix to get cmake
...
to build). These are more appropriate to the stdenv branch. I'll
apply them there.
svn path=/nixpkgs/trunk/; revision=30308
2011-11-07 22:05:46 +00:00
David Guibert
29bdb369ab
update cmake
...
svn path=/nixpkgs/trunk/; revision=30278
2011-11-06 20:03:00 +00:00
Eelco Dolstra
35781b1bf3
* Cmake 2.8.5 doesn't build on i686-linux
...
(http://hydra.nixos.org/build/1181148 ), so revert to 2.8.4 for now.
svn path=/nixpkgs/branches/kde-4.7/; revision=27990
2011-07-28 14:09:16 +00:00
Eelco Dolstra
489d1be918
* Cmake updated to 2.8.5. Also added a patch that prevents Cmake from
...
looking in /usr and similar locations. However, it *will* now look
in the Nixpkgs Glibc lib and include directories. This ensures that
find_library can find libraries in Glibc.
svn path=/nixpkgs/branches/kde-4.7/; revision=27884
2011-07-21 18:21:38 +00:00
Michael Raskin
8a00dfcc18
Update teeworlds
...
svn path=/nixpkgs/trunk/; revision=26814
2011-04-13 05:47:51 +00:00
Lluís Batlle i Rossell
48748dedcb
Adding the rally game Trigger. As a side effect, I add jam.
...
svn path=/nixpkgs/trunk/; revision=26615
2011-03-30 18:45:11 +00:00
Peter Simons
05474e174b
cmake: updated meta.platforms to reflect the fact that CMake is supposed to build on all Unix-like platforms
...
svn path=/nixpkgs/trunk/; revision=26512
2011-03-25 12:55:33 +00:00
Peter Simons
5ba10a94e1
cmake: add install_name_tool on Darwin to fix the build
...
svn path=/nixpkgs/trunk/; revision=26511
2011-03-25 12:55:29 +00:00
Yury G. Kudryashov
53a7f85871
cmake-2.8.4
...
svn path=/nixpkgs/trunk/; revision=26137
2011-03-02 18:49:56 +00:00
Yury G. Kudryashov
2e92a0cd12
cmake-2.8.3
...
svn path=/nixpkgs/trunk/; revision=25859
2011-02-09 21:08:53 +00:00
Rob Vermaas
5b408a85da
build cmake only on linux and freebsd
...
svn path=/nixpkgs/trunk/; revision=25412
2011-01-05 10:04:49 +00:00
Lluís Batlle i Rossell
ee04ffcb55
Updating from trunk. I resolved simple conflicts.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=25061
2010-12-11 12:47:00 +00:00
Peter Simons
baa9150130
pkgs/development/tools/build-managers/scons: cosmetic build improvements
...
- The flag "--mandir" has no effect with setup.py. Instead, "--install-data"
must be used.
- Don't generate wrappers for trivial symlink aliases in bin.
- Prefer symlinks over hard-links.
- The dependencies of this expression don't need to be propagated.
svn path=/nixpkgs/trunk/; revision=25021
2010-12-07 11:41:25 +00:00
Peter Simons
1e1610b37e
pkgs/development/tools/build-managers/scons: move --mandir and --infodir to standard locations
...
svn path=/nixpkgs/trunk/; revision=25009
2010-12-06 18:01:28 +00:00
Ludovic Courtès
e729128faa
GNU Make 3.82: Ignore test failures on Darwin.
...
See <http://hydra.nixos.org/build/740597/nixlog/1/raw >.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24626
2010-11-09 13:12:26 +00:00
Ludovic Courtès
7ecc652da4
Re-add GNU Make 3.81.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=24623
2010-11-09 09:14:07 +00:00
Lluís Batlle i Rossell
6dc839d344
Merging from trunk. I resolved some conflicts; I hope that well.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=24429
2010-10-23 14:52:21 +00:00
Russell O'Connor
9bcb9bcea1
Patching scons to give an absolute path to python rather than using ".../bin/env python"
...
When users install scons, users no longer need to also install python in their environment.
svn path=/nixpkgs/trunk/; revision=24425
2010-10-22 19:10:02 +00:00
Lluís Batlle i Rossell
cd4b54748a
Updating from trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=24038
2010-10-03 09:25:34 +00:00
Yury G. Kudryashov
cd73464fdf
Mention UIs in cmake.name
...
svn path=/nixpkgs/trunk/; revision=24026
2010-10-02 05:24:39 +00:00
Lluís Batlle i Rossell
2c5de61327
Updating from trunk.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=23840
2010-09-17 19:10:21 +00:00
Yury G. Kudryashov
139de1ea2f
Don't try to build Qt guis if qt is unsupported on the platform
...
svn path=/nixpkgs/trunk/; revision=23812
2010-09-15 18:52:07 +00:00
Yury G. Kudryashov
48c13f4096
Update cmake
...
Use system libraries, make curses optional, add optional qt4 gui etc.
svn path=/nixpkgs/trunk/; revision=23810
2010-09-15 18:37:21 +00:00
Lluís Batlle i Rossell
cca1cae042
Updating from trunk. I had to do some changes to make it fit.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=23500
2010-08-29 11:09:23 +00:00
Eelco Dolstra
a9da4153c4
* Fix an infinite recursion in scons.
...
svn path=/nixpkgs/trunk/; revision=23464
2010-08-26 13:30:25 +00:00
Peter Simons
25308dd098
pkgs/development/tools/build-managers/scons: updated to version 2.0.1
...
svn path=/nixpkgs/trunk/; revision=23457
2010-08-26 12:24:16 +00:00
Lluís Batlle i Rossell
75a9a710fd
Fixing the gnumake log.patch so it applies to the new gnumake
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=23308
2010-08-21 15:54:48 +00:00
Ludovic Courtès
58b1dfe0fe
GNU Make 3.82.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=23281
2010-08-20 15:26:41 +00:00
Eelco Dolstra
6609710409
* Get rid of many instances of "args: with args;", and other coding
...
guidelines violations.
* Updated libsamplerate to 0.1.7.
svn path=/nixpkgs/trunk/; revision=22782
2010-07-28 11:55:54 +00:00
Ludovic Courtès
c1cd5e04af
Ant: Fix typo.
...
svn path=/nixpkgs/trunk/; revision=21991
2010-05-26 15:10:24 +00:00
Ludovic Courtès
c228b1a957
Ant/GCJ: Clean up.
...
svn path=/nixpkgs/trunk/; revision=21990
2010-05-26 14:53:13 +00:00
Peter Simons
fd8c6ae43d
Moved 'maintainers' attribute into the meta section of the expression.
...
I've also set the 'platforms' attribute to ensure that Hydra actually
builds these packages. Thanks to Lluís Batlle i Rossell for pointing out
these mistakes.
svn path=/nixpkgs/trunk/; revision=21688
2010-05-09 16:01:44 +00:00
Marc Weber
8d9af6d596
patch provided by David Brown adding simple-build-tool which builds Scala packages
...
svn path=/nixpkgs/trunk/; revision=21671
2010-05-08 21:51:47 +00:00
Peter Simons
69857a11c7
pkgs/development/tools/build-managers/scons: bumped to version 1.3.0
...
svn path=/nixpkgs/trunk/; revision=21025
2010-04-12 11:21:22 +00:00