JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
275,465 Commits 2 Branches 0 Tags 13 GiB
773c4b840f
Commit Graph

267 Commits

Author SHA1 Message Date
Matthew Bauer
11f0e07d4f unixtools: replace darwin.ps 2018-03-27 18:17:46 -05:00
Matthew Justin Bauer
92a5b1b055
Merge pull request #37015 from matthewbauer/cmake-mac-flags 
cmake: Setup default macOS flags
 2018-03-22 11:16:03 -05:00
Matthew Bauer
4cc1cd8516 cmake-2.8: supports darwin 
builds fine, just need to enable to
 2018-03-19 05:42:15 -05:00
Matthew Bauer
bd9b17f762 cmake: correctly detect clang compiler on macOS 2018-03-14 14:36:27 -05:00
Matthew Bauer
8beb809fd1 cmake: don't detect macOS deployment target 2018-03-14 14:31:53 -05:00
Matthew Bauer
acbf439fef cmake: disable detecting global macOS sdk 2018-03-14 14:30:10 -05:00
Matthew Bauer
b99cae3931 cmake: set CMAKE_FIND_FRAMEWORK=last 2018-03-14 14:20:07 -05:00
Will Dietz
e25a343716 cmake: don't force gcc, use more general cc/c++ 2018-02-13 12:39:34 -06:00
Will Dietz
37c2ac90e6 cmake: fix cross 
TODO: toolchain file instead?
 2018-02-13 09:44:29 -06:00
Vladimír Čunát
ef60e41145
cmake: bring back 3.9 for Darwin bootstrap 
Broken by ba6e0ae33df36; see e.g. https://hydra.nixos.org/build/68223628
 2018-01-27 09:11:37 +01:00
Vladimír Čunát
ba6e0ae33d
cmake: 3.9.6 -> 3.10.2 
Close #33435 (superseded).
 2018-01-21 11:59:12 +01:00
Frederik Rietdijk
27f6f9409b
Merge pull request #33967 from yegortimoshenko/20180117.050213/mornfall 
maintainers: remove mornfall from packages
 2018-01-18 11:27:31 +01:00
Yegor Timoshenko
506c89c30a maintainers: remove mornfall from packages 2018-01-17 05:17:33 +00:00
Daiderd Jordan
6f10cfc777
cmake: fix INSTALL_NAME_DIR for darwin libraries 
When there's a lib output libraries won't be intalled to $prefix causing
output cycles.
 2018-01-07 09:45:25 +01:00
John Ericson
046f091e0d treewide: Don't use envHook anymore 
This commits needs a MAJOR audit as I oftentimes just guessed which of
`$hostOffset`, `$targetOffset`, or a fixed offset should be used.
 2017-12-30 22:04:22 -05:00
Orivej Desh
031138b7f0 cmake: enable parallel building of cmake projects by default 2017-12-07 08:52:42 +00:00
Orivej Desh
da516f0404 cmake: generate for Ninja when the build phase is Ninja 
This is overridable by providing a custom build phase or setting
dontUseNinjaBuild = true.
 2017-12-07 08:52:42 +00:00
Vladimír Čunát
c465185bb7
cmake: maintenance 3.9.4 -> 3.9.6 2017-11-27 13:36:14 +01:00
Matthew Bauer
24eb665695 cmake: setup CMAKE_FRAMEWORK_PATH 
This tells cmake how to find macOS frameworks.

Fixes #26197
 2017-10-21 02:27:09 -05:00
Vladimír Čunát
2aca029ed2
cmake: maintenance 3.9.2 -> 3.9.4 2017-10-08 18:24:12 +02:00
Vladimír Čunát
cea9a52dac
cmake: maintenance 3.9.1 -> 3.9.2 2017-09-24 11:28:30 +02:00
Bernd Amend
b49b9da3ce
cmake: add withQt5 option and make it the default 2017-09-06 08:02:08 -05:00
Bernd Amend
f3ac052f24
cmake: 3.8.2 -> 3.9.1 2017-09-06 08:02:05 -05:00
hsloan
3e69864717 cmake 2.8: Don't use stdenv ? cross 2017-06-28 19:42:46 -04:00
Vladimír Čunát
d74d871f52
cmake: 3.7.2 -> 3.8.2 
Tested several cmake-built packages, and all seems OK;
hopefully there won't be many problems.
 2017-06-11 17:10:49 +02:00
Daiderd Jordan
9e2aba3572
darwin-stdenv: remove python-sphinx and a bunch of other dependencies from the stdenv 2017-06-01 23:23:56 +02:00
Linus Heckemann
28154f45a6 cmake setup hook: allow other build types 2017-05-10 14:33:20 +01:00
David Grayson
934ed02750 cmake: Prevent it from looking for packages in / 
when cross-compiling for Windows.
 2017-04-29 09:55:37 -07:00
Vladimír Čunát
96d41e393d
treewide: purge maintainers.urkud 
It's sad, but he's been inactive for the last five years.
Keeping such people in meta.maintainers is counter-productive.
 2017-03-27 19:52:29 +02:00
Vladimír Čunát
5cf7b7c109
cmake: 3.7.1 -> 3.7.2 2017-02-20 21:29:52 +01:00
Daiderd Jordan
538d1b688a stdenv: bootstrap cmake and python on darwin 2017-01-03 18:01:47 +01:00
Aristid Breitkreuz
76c4b5fcca cmake: 3.6.2 -> 3.7.1 2016-12-20 16:20:08 +01:00
Vladimír Čunát
31f0fdef32
cmake: minor update 3.6.0 -> 3.6.2 2016-10-29 22:08:25 +02:00
Will Dietz
48d7c7751a cmake: bootstrap in parallel 
Builds on previous commit so this happens without needing stdenv.glibc.
 2016-10-13 08:07:58 -05:00
Will Dietz
07849e749a cmake: When there is no stdenv.glibc, still fix search paths. 
Apply all of the fixups from preConfigure as well!

For testing purposes I added the following assert:

assert (stdenv ? glibc) -> (stdenv.glibc == stdenv.cc.libc);

To ensure behavior in the case there is a 'stdenv.glibc' (linux-only?)
wasn't changed, which passes in the configurations I could think of.

Not including that since it seems like a bad requirement moving forward.
 2016-10-13 08:05:37 -05:00
Eelco Dolstra
e03d1ababa cmake-2.8: Fix build 
The use of multiple outputs in libarchive broke it. Since this is an
ancient version of cmake, let's fix it by just using
--no-system-libarchive.
 2016-09-20 11:56:11 +02:00
Michael Raskin
dabf09aa92 cmake: update setup-hook to take -isystem instead of -I into account 2016-09-08 09:10:00 +02:00
Tuomas Tynkkynen
3364230d56 Disable bunch of non-compiling packages on Darwin 
These ones have a "Last successful build" timestamp in the 2014s or
2015s. Presumably no one will notice if we now stop building them.

softether_4_18              2015-09-20  http://hydra.nixos.org/build/39418483
lensfun                     2014-09-30  http://hydra.nixos.org/build/39394104
net_snmp                    2015-09-20  http://hydra.nixos.org/build/39410553
djview                      2015-08-11  http://hydra.nixos.org/build/39413233
libmusicbrainz2             2015-09-20  http://hydra.nixos.org/build/39410106
fox_1_6                     2014-05-07  http://hydra.nixos.org/build/39410858
libofx                      2015-09-24  http://hydra.nixos.org/build/39423507
yacas                       2014-09-30  http://hydra.nixos.org/build/39393150
iomelt                      2014-09-30  http://hydra.nixos.org/build/39408486
softether                   2015-09-20  http://hydra.nixos.org/build/39425800
mp4v2                       2014-09-30  http://hydra.nixos.org/build/39421899
virtuoso7                   2014-09-21  http://hydra.nixos.org/build/39415206
man_db                      2015-04-23  http://hydra.nixos.org/build/39404236
libdiscid                   2014-09-30  http://hydra.nixos.org/build/39412202
zabbix22.agent              2014-09-21  http://hydra.nixos.org/build/39412149
vidalia                     2015-08-06  http://hydra.nixos.org/build/39411500
libmtp                      2015-09-20  http://hydra.nixos.org/build/39419199
wxGTK29                     2015-09-20  http://hydra.nixos.org/build/39415296
ncmpcpp                     2015-11-06  http://hydra.nixos.org/build/39404455
libtorrent                  2014-09-21  http://hydra.nixos.org/build/39394646
shishi                      2014-03-21  http://hydra.nixos.org/build/39418874
ocaml_3_12_1                2014-09-30  http://hydra.nixos.org/build/39392996
djview4                     2015-08-11  http://hydra.nixos.org/build/39427799
vimNox                      2014-05-23  http://hydra.nixos.org/build/39397012
ttfautohint                 2015-08-06  http://hydra.nixos.org/build/39398330
libraw                      2015-09-24  http://hydra.nixos.org/build/39402271
wxGTK30                     2015-09-20  http://hydra.nixos.org/build/39401871
sbcl_1_2_5                  2015-09-20  http://hydra.nixos.org/build/39426091
prover9                     2014-09-30  http://hydra.nixos.org/build/39406476
rcs                         2015-08-25  http://hydra.nixos.org/build/39392037
gpac                        2015-09-24  http://hydra.nixos.org/build/39399470
virtuoso6                   2014-09-30  http://hydra.nixos.org/build/39398651
xlslib                      2015-09-24  http://hydra.nixos.org/build/39410387
ucommon                     2015-03-27  http://hydra.nixos.org/build/39414040
commoncpp2                  2014-09-30  http://hydra.nixos.org/build/39420117
virtuoso                    2014-09-21  http://hydra.nixos.org/build/39399978
miniHttpd                   2014-09-30  http://hydra.nixos.org/build/39392925
mpack                       2014-09-26  http://hydra.nixos.org/build/39399535
nbd                         2014-09-26  http://hydra.nixos.org/build/39401367
newsbeuter-dev              2014-07-29  http://hydra.nixos.org/build/39406259
gimp_2_8                    2015-09-20  http://hydra.nixos.org/build/39436271
gimp                        2015-09-20  http://hydra.nixos.org/build/39435976
zabbix20.agent              2014-09-30  http://hydra.nixos.org/build/39393242
gst_all_1.gst-plugins-good  2015-09-20  http://hydra.nixos.org/build/39408506
ocaml_4_00_1                2014-09-30  http://hydra.nixos.org/build/39399526
inadyn                      2014-09-30  http://hydra.nixos.org/build/39426389
gst_all_1.gst-plugins-bad   2015-09-20  http://hydra.nixos.org/build/39392970
zabbix.agent                2014-09-30  http://hydra.nixos.org/build/39421412
cmake-2_8                   2015-09-24  http://hydra.nixos.org/build/39399443
liblastfm                   2015-08-06  http://hydra.nixos.org/build/39421812
newsbeuter                  2014-07-29  http://hydra.nixos.org/build/39396605
sdcv                        2014-09-26  http://hydra.nixos.org/build/39412928
 2016-09-01 20:39:33 +03:00
Tuomas Tynkkynen
8ed3d6a7e5 cmake 2.8: Fix build with shuffled outputs 2016-08-29 14:49:52 +03:00
Alexey Shmalko
176f804f36 cmake: 3.4.3 -> 3.6.0 2016-08-02 10:32:52 -05:00
Julien Dehos
5286c0aebb cmake: add support for cxxtest 2016-08-01 22:11:00 +02:00
Thomas Tuegel
d5d4606190 Revert "cmake: use supplied RPATH instead of guessing" 
This reverts commit 8ec5adc953.

This broke stdenv on Darwin, see #15881. A Darwin user will need to fix
the problem and un-revert. This commit causes CMake to use the same
RPATH settings as the compiler, so it is obviously correct.
 2016-05-31 16:30:15 -05:00
Thomas Tuegel
8ec5adc953 cmake: use supplied RPATH instead of guessing 2016-05-31 13:02:10 -05:00
Thomas Tuegel
b70d728ed7 cmake: use single output 
Fixes #15184. Install everything, including documentation, into one
output, increasing package size by 10%. Otherwise, the help commands for
CMake do not work. This is a good trade because CMake should be a
build-only dependency. The only reason the docs should ever make it to
runtime is if the user has actually installed CMake, in which case
there's a pretty good chance they want the docs, too.
 2016-05-06 16:26:40 -05:00
Nikolay Amiantov
96a5c34bc5 cmake2_8: use get(Output) functions 2016-04-25 13:24:40 +03:00
Nikolay Amiantov
5ff40ddedf add get* helper functions and mass-replace manual outputs search with them 2016-04-25 13:24:39 +03:00
Thomas Tuegel
491f7f017c cmake: set LIBDIR and INCLUDEDIR for multiple outputs 2016-04-20 10:01:06 -05:00
Nikolay Amiantov
52637e22cd cmake: add all glibc outputs to system prefix 2016-04-14 01:03:23 +03:00
Nikolay Amiantov
d528c7d8f5 cmake-2_8: fix for multiple outputs 2016-04-14 01:03:23 +03:00
Vladimír Čunát
09af15654f Merge master into closure-size 
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
 2016-03-08 09:58:19 +01:00
Vladimír Čunát
d3a3aa8674 Merge #12740: multiple outputs for Qt 5 and KDE 5 2016-02-03 17:09:09 +01:00
Vladimír Čunát
80270e2019 cmake: maintenance updates 3.4.0 -> 3.4.3 2016-02-03 16:59:38 +01:00
Vladimír Čunát
ae74c356d9 Merge recent 'staging' into closure-size 
Let's get rid of those merge conflicts.
 2016-02-03 16:57:19 +01:00
Thomas Tuegel
a714284d8b cmake: don't set incompatible flags for multiple outputs 2016-01-31 21:15:03 -06:00
Thomas Tuegel
1087020a46 cmake: invoke configure hooks correctly 
Otherwise, the multiple-outputs hooks will not fire correctly.
 2016-01-31 21:15:03 -06:00
Tobias Geerinckx-Rice
32d40f0f98 Remove no longer (or never) referenced patches 
55 files changed, 6041 deletions. Tested with `nix-build -A tarball`.
 2016-01-24 02:02:21 +01:00
Luca Bruno
e289717414 rename moveToOutput and propagatedBuildInputs 2015-12-02 10:05:36 +01:00
Luca Bruno
920b1d3591 Merge branch 'master' into closure-size 2015-11-29 16:50:26 +01:00
Vladimír Čunát
f2ad4a47e8 cmake: remove conditional patch that no longer applies 
Close #11290. The patch will no longer apply on *any* platform.
 2015-11-29 08:58:39 +01:00
Vladimír Čunát
333d69a5f0 Merge staging into closure-size 
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
 2015-11-20 14:32:58 +01:00
William A. Kennington III
050bebb8c4 cmake: 3.3.2 -> 3.4.0 2015-11-13 15:55:44 -08:00
Vladimír Čunát
1d921ad3a7 cmake-2.8: fix build with multiple outputs 2015-10-28 13:30:50 +01:00
Vladimír Čunát
5227fb1dd5 Merge commit staging+systemd into closure-size 
Many non-conflict problems weren't (fully) resolved in this commit yet.
 2015-10-03 13:33:37 +02:00
William A. Kennington III
5ba050a1a3 cmake: 3.3.1 -> 3.3.2 2015-09-20 14:08:22 -07:00
William A. Kennington III
6fccef2be0 cmake: 3.3.0 -> 3.3.1 2015-08-14 00:12:59 -07:00
William A. Kennington III
793cbaedf4 cmake: 3.2.2 -> 3.3.0 2015-08-06 10:15:04 -07:00
William A. Kennington III
954801a9a8 Merge branch 'master.upstream' into staging.upstream 2015-06-12 13:47:46 -07:00
Rok Garbas
0860826795 cygwin: cmake expression should not change for linux 2015-06-12 12:17:12 +02:00
Rok Garbas
277c263c1e cygwin: update patch for cmake 3.2.2 2015-06-12 12:17:12 +02:00
Eelco Dolstra
e7f1038798 Fix typo in last merge 2015-06-01 20:09:31 +02:00
Eelco Dolstra
553abf71ba Merge remote-tracking branch 'origin/staging' into gcc-4.9 
Conflicts:
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/libraries/wayland/default.nix
	pkgs/development/tools/build-managers/cmake/default.nix
	pkgs/top-level/all-packages.nix
 2015-06-01 20:08:43 +02:00
Florian Friesdorf
90a97d32df cygwin cmake 2015-05-28 10:53:36 +02:00
Joel Taylor
78ef78719f Merge branch 'master' of https://github.com/NixOS/nixpkgs 2015-05-15 14:33:21 -07:00
Joel Taylor
1aef9fc4af cmake: disable building with ncurses if building without ncurses 2015-05-15 14:31:40 -07:00
Vladimír Čunát
b7fe141f6b Revert "remove cmake-2.8" 
Some packages fail with the only cmake version we've left.
This reverts commit 67199bda4e.
 2015-05-15 23:02:41 +02:00
Eelco Dolstra
26f17ee091 cmake: Get rid of circular dependency 
Also, don't install static libraries in jsoncpp.
 2015-05-13 18:17:26 +02:00
William A. Kennington III
64c68c5413 cmake: 3.2.1 -> 3.2.2 2015-05-01 22:27:14 -07:00
Vladimír Čunát
a8813a3db0 cmake: fix with multiple outputs, split help, refactor 
The removed configureFlags seemed to have no effect.
 2015-04-18 22:30:26 +02:00
Vladimír Čunát
bf414c9d4f Merge 'staging' into closure-size 
- there were many easy merge conflicts
- cc-wrapper needed nontrivial changes

Many other problems might've been created by interaction of the branches,
but stdenv and a few other packages build fine now.
 2015-04-18 11:22:20 +02:00
Eric Seidel
c94b24fa4a fix fallout from merge of master 2015-04-06 19:48:44 -07:00
John Wiegley
d628247bdf Merge pull request #7095 from giogadi/cmake-full-install-name-staging 
Make cmake install shared libraries with full install names by default
 2015-03-30 21:47:27 -05:00
Luis G. Torres
ff35c4a5e2 Make cmake install libraries with full install names by default so that executables can find cmake-installed shared libraries at runtime on Darwin. Addresses #6821. 2015-03-30 21:25:44 -04:00
William A. Kennington III
22018c40d1 cmake: Remove obsolete openssl patch 2015-03-27 11:30:39 -07:00
William A. Kennington III
767c179a94 Merge branch 'master' into staging 2015-03-26 14:44:05 -07:00
goodwillcoding
62d4564de4 fix the cmake 2.8.x detection of OpenSSL version broken in openssl 1.0.1m 
this is a follow up to security update for openssl: 1.0.1l -> 1.0.1m,
references:
 - http://public.kitware.com/Bug/bug_relationship_graph.php?bug_id=15386
 - http://www.cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c5d9a8283cfac15b4a5a07f18d5eb10c1f388505#patch1

(cherry picked from commit 30dd174520827c58f7d58408029f8845878dd021)
Signed-off-by: Domen Kožar <domen@dev.si>
 2015-03-26 11:42:02 +01:00
Thomas Tuegel
f47af9b2c8 remove cmake-3.0 2015-03-22 17:03:57 -05:00
Thomas Tuegel
3628370127 remove cmake-2.6.4 2015-03-22 17:02:32 -05:00
Thomas Tuegel
67199bda4e remove cmake-2.8 2015-03-22 17:01:45 -05:00
Thomas Tuegel
a910301e18 make cmake-3.2 the default version 2015-03-22 17:00:46 -05:00
Thomas Tuegel
7e21c519ba add cmake-3.2.1 
Earlier versions of CMake have a bug in their OpenSSL version detection code.
 2015-03-21 12:32:38 -05:00
Eric Seidel
dbf3d31727 make llvm-3.5 the default and remove references to gccApple 
make perl be less dumb

revert change to release.nix
 2015-02-03 14:31:04 -08:00
Michael Raskin
ffbd1d011b Add CMake 3.0 — Fixes #4363 — mostly-merging a PR by bbenoist 2014-11-09 18:31:46 +03:00
Vladimír Čunát
381dcb1d98 various packages fixed 2014-08-30 23:30:31 +02:00
Vladimír Čunát
abbc93f783 WIP: getting better 2014-08-30 19:11:52 +02:00
Vladimír Čunát
96cec2a7bd Merge 'staging' into multiple-outputs 
Conflicts:
	pkgs/applications/audio/flac/default.nix
	pkgs/build-support/gcc-wrapper/builder.sh
	pkgs/development/libraries/apr-util/default.nix
	pkgs/development/libraries/apr/default.nix
	pkgs/development/libraries/atk/default.nix
	pkgs/development/libraries/freetype/default.nix
	pkgs/development/libraries/gdk-pixbuf/default.nix
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/glibc/2.17/builder.sh
	pkgs/development/libraries/glibc/2.17/locales.nix
	pkgs/development/libraries/libjpeg/default.nix
	pkgs/development/libraries/libogg/default.nix
	pkgs/development/libraries/libsamplerate/default.nix
	pkgs/development/libraries/libtiff/default.nix
	pkgs/development/libraries/libvorbis/default.nix
	pkgs/development/libraries/mesa/default.nix
	pkgs/development/libraries/pango/default.nix
	pkgs/development/web/nodejs/default.nix
	pkgs/os-specific/linux/pam/default.nix
	pkgs/os-specific/linux/systemd/default.nix
	pkgs/stdenv/generic/setup.sh
	pkgs/stdenv/linux/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/release-small.nix
 2014-08-23 16:04:53 +02:00
Eelco Dolstra
0acc4e6b26 cmake: Fix setup hook on bash < 4.0 
This matters in nix-shell and stdenvNative on Darwin.

Fixes #3204.
 2014-08-09 23:14:01 +02:00
Vladimír Čunát
02a1e85ab1 cmake, podofo: fix finding freetype-2.5 2014-06-26 18:24:44 +02:00
aszlig
5eb3dd8a1b
cmake: Add patch for fixing Darwin cross-builds. 
This is an upstream patch and will eventually get into the next release.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-03-12 10:00:49 +01:00
Petr Rockai
abd8059802 cmake: Update to latest upstream (2.8.12.2). 2014-02-15 10:27:38 +01:00
Petr Rockai
6f5be260b4 Adopt packages. 2014-01-28 17:31:17 +01:00
Eelco Dolstra
7c8518c194 Cleanup 2013-08-23 10:02:07 +02:00
bbenoist
e13720c3c4 cmake: Fix CTest custom commands 
This commit is related to:
 - https://github.com/NixOS/nixpkgs/issues/762
 - http://public.kitware.com/Bug/view.php?id=13887
And fixes a bug present in recent CMake versions.

The fix should be integrated in the next CMake release.
 2013-08-21 10:24:53 +02:00
bbenoist
bef090400e cmake: Update to 2.8.11.2 2013-08-21 10:24:53 +02:00
Vladimír Čunát
3314be6b73 cmake: consistent names, to satisfy comments on #567 2013-06-27 16:33:24 +02:00
Vladimír Čunát
7f1e09c35d Re-Revert "Merge pull request #567 from MarcWeber/submit/cmake-improvement" 
This reverts commit b08e12b37a.
 2013-06-27 15:14:32 +02:00
Peter Simons
b08e12b37a Revert "Merge pull request #567 from MarcWeber/submit/cmake-improvement" 
This reverts commit abc7591aaf, reversing changes
made to 6b1ebeccf2, because they broke half the
packages in stdenv-updates: http://hydra.nixos.org/eval/927013 has further
details.
 2013-06-17 10:19:15 +02:00
Marc Weber
f7ef08e5cd experimental/cmake-improvement 
set CMAKE_LIBRARY_PATH, CMAKE_INCLUDE_PATH based on NIX_CFLAGS_COMPILE and
NIX_LDFLAGS so that cmake's find_library like functions find all the libraries
gcc knows about thanks to the gcc wrapper

This is particular useful with myEnvFun which then also sets those CMAKE_* env
variables.`

Because setup.sh has to change this causes many rebuilds - thus it should be
included in a stdenv-update like branch

Also cmake builds in parallel perfectly fine

update cmake to latest minor number, I didn't change the patches,
just reapplied them manually recordin a new patch
 2013-05-28 16:22:45 +02:00
Lluís Batlle i Rossell
183b37645b cmake setup-hook: fixing cmakeFlagsArray 
The array wasn'te expanded properly, the spaces weren't preserved.
 2013-03-12 11:31:58 +01:00
Shea Levy
45f6008817 cmake setup hook: If configurePhase is set, don't override it 2013-02-07 14:03:23 -05:00
Shea Levy
29fd8d4eaa cmake: Bump 2012-10-08 03:12:42 -04:00
Ludovic Courtès
04600bbec1 Darwin: Add mig', lipo', etc. to `stdenvNative'. 
Consequently, remove `darwinLipoUtility', `darwinArchUtility', etc.

svn path=/nixpkgs/trunk/; revision=33893
 2012-04-23 15:47:31 +00:00
Yury G. Kudryashov
2a074000be patch and fixCmakeFiles do not commute 
svn path=/nixpkgs/trunk/; revision=32876
 2012-03-08 07:59:56 +00:00
Yury G. Kudryashov
614d81046c Remove cmake_2_8_7: default is already 2.8.7 
svn path=/nixpkgs/trunk/; revision=32827
 2012-03-06 14:35:30 +00:00
Yury G. Kudryashov
0210e20b5a svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32713
 2012-03-01 07:04:39 +00:00
Michael Raskin
4ff245c5de Add fresh cmake 
svn path=/nixpkgs/trunk/; revision=32611
 2012-02-27 06:22:47 +00:00
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
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
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
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
Yury G. Kudryashov
cd73464fdf Mention UIs in cmake.name 
svn path=/nixpkgs/trunk/; revision=24026
 2010-10-02 05:24:39 +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
bc54fc96da Updating cmake. Big kde rebuild to come. 
svn path=/nixpkgs/trunk/; revision=20996
 2010-04-09 16:04:11 +00:00
Lluís Batlle i Rossell
4a6cfd435e Removing a part of the cmake setup-hook that broke at least the findqt4 cmake module. 
That way, we don't need the patch anymore to fix what that part broke.

Also kde stops needing the findqt4 patch (for its own copy of the findqt4 cmake module).

I tested a nixos-rebuild with kde4, and it builds as far as hydra built with this configuration.

svn path=/nixpkgs/trunk/; revision=20921
 2010-04-01 18:19:44 +00:00
Lluís Batlle i Rossell
e0ff817c40 Big kde-related update. 
I updated cmake to use CMAKE_PREFIX_PATH instead of CMAKE_INCLUDE_PATH and CMAKE_LIBRARY_PATH.
There were some expressions in kde that required CMAKE_PREFIX_PATH, and now they are not anymore
a special case.
I updated most kde-4.4 files to point to kde-4.4.0 sources instead of 4.3.4 .

svn path=/nixpkgs/trunk/; revision=19965
 2010-02-12 21:58:27 +00:00
Lluís Batlle i Rossell
dae3eb2383 Merging from trunk. 
I resolved two conflicts:
- cmake (trunk fixes + stdenv-updates cross-compiling)
- all-packages (trunk gcc-wrapper2 + stdenv-updates gcc44)


svn path=/nixpkgs/branches/stdenv-updates/; revision=18912
 2009-12-12 18:39:09 +00:00
Lluís Batlle i Rossell
2dd9764a9e Major update to cmake, from 2.6.4 to 2.8.0. 
I tried some kde4 builds, and the worked.

svn path=/nixpkgs/trunk/; revision=18890
 2009-12-11 07:58:54 +00:00
Lluís Batlle i Rossell
f3c23487a2 Adding a new version of the gcc-wrapper, named gcc-wrapper2, in order not to rebuild 
stdenv.

In this gcc-wrapper2 I made the ld-wrapper.sh to handle the linking with shared
objects through direct pass as ld command arguments of the absolute path to shared
objects, instead of using the -L/-l combinations.

cmake 'FindXXX.cmake' modules make a strong usage of the dynamic linking directly
passing the absolute path to the shared object to the linker, and as our wrapper did
not add any -rpath for those, writting the nix expressions for some cmake packages
resulted in a lot of tricks, compared to using this gcc-wrapper2.

This gcc-wrapper2/ld-wrapper.sh should become the gcc-wrapper/ld-wrapper in a
stdenv update.

I also updated some cmake expressions to use this gcc-wrapper2, and reduced its
tricks.

I also updated the cmake setup-hook for it to make cmake not touch any rpath decided
at build time, when running the 'make install' of makefiles created by cmake.

svn path=/nixpkgs/trunk/; revision=18885
 2009-12-10 22:19:52 +00:00
Lluís Batlle i Rossell
585ba8c27f Big fixes in the cross build: 
- Before this changes, cflags and ldflags for the native and the cross compiler
  got mixed. Not all the gcc-wrapper/gcc-cross-wrapper variables are
  independant now, but enough, I think.
- Fixed the generic stdenv expression, which did a big mess on buildInputs and
  buildNativeInputs. Now it distinguishes when there is a stdenvCross or not.
  Maybe we should have a single stdenv and forget about the stdenvCross
  adapter - this could end in a stdenv a bit complex, but simpler than the
  generic stdenv + adapter.
- Added basic support in pkgconfig for cross-builds: a single PKG_CONFIG_PATH
  now works for both the cross and the native compilers, but I think this
  should work well for most cases I can think of.
- I tried to fix the guile expression to cross-biuld; guile is built, but not
  its manual, so the derivation still fails. Guile requires patching to
  cross-build, as far as I understnad.
- Made the glibcCross build to be done through the usage of a
  gcc-cross-wrapper over the gcc-cross-stage-static, instead of using it
  directly.
- Trying to make physfs (a neverball dependency) cross build.
- Updated the gcc expression to support building a cross compiler without getting
  derivation variables mixed with those of the stdenvCross.

svn path=/nixpkgs/branches/stdenv-updates/; revision=18534
 2009-11-22 19:51:45 +00:00
Lluís Batlle i Rossell
94d2e57c62 Trying to fix the cmake-qt problems, fixing cmake's FindQt4. Paraview now builds beyond 25%, while 
before it didn't. Through this commit I expect the build farm to try to build kde, and see
whether this way it builds without the unusual NIX_CFLAGS_COMPILE set in the qt setup-hook.

svn path=/nixpkgs/trunk/; revision=15838
 2009-06-03 09:19:19 +00:00
Lluís Batlle i Rossell
07caf9a9bd Updated cmake 
svn path=/nixpkgs/trunk/; revision=15807
 2009-05-31 08:34:57 +00:00
Eelco Dolstra
f762b50991 * Another sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=15269
 2009-04-23 11:59:43 +00:00
Eelco Dolstra
6b9ccbaf78 * setup.sh: turn on nullglob globally. 
* setup.sh: removed some obsolete features, specifically some that
  were only used by the old build farm.
* addToSearchPath: removed some parameters that weren't used
  anywhere.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15136
 2009-04-18 22:22:51 +00:00
Peter Simons
047f6d20d5 Updated CMake to version 2.6.3. 
svn path=/nixpkgs/trunk/; revision=15114
 2009-04-17 13:48:22 +00:00