volth
f3282c8d1e
treewide: remove unused variables ( #63177 )
...
* treewide: remove unused variables
* making ofborg happy
2019-06-16 19:59:05 +00:00
Matthew Bauer
eaadbdf1c3
cmake: don’t use cf-private
...
cf-private is not necessary here. cmake just needs the CoreFoundation
framework to be used. swift-corefoundation seems to work fine in this case.
/cc @lnl7
2019-04-26 21:54:49 -04:00
Matthew Bauer
91f0c848f4
cmake: set BUILD_TESTING=OFF when doCheck is false
...
This means we can avoid building test suites that will never be run.
2019-03-09 14:32:55 -05:00
Daiderd Jordan
cb8e6f73f5
cmake: add cf-private on darwin
2019-02-24 11:32:47 +01:00
Daiderd Jordan
c8aaadcc9d
cmake: disable ApplicationServices and CoreServices on darwin
2019-02-24 11:30:48 +01:00
Vladimír Čunát
052e34a66f
Merge #56059 : cmake: 3.12.1 -> 3.13.4 (into staging)
2019-02-22 07:23:08 +01:00
Matthew Bauer
ae3e8355ab
Merge pull request #56021 from illegalprime/fix/cmake-cross
...
cmake: add ability to cross-compile cmake
2019-02-19 22:34:15 -05:00
Sam Stites
9b38f6f09f
bump cmake to 3.13.4
2019-02-19 13:21:30 -05:00
Michael Eden
cbbde55382
cmake: add ability to cross-compile cmake
2019-02-18 17:41:03 -05:00
Florian Franzen
e0e4577c0f
cmake: disable package registry
2019-01-31 10:17:55 +01:00
Jan Tojnar
c0d2f92459
cmake: use multiple outputs for GNUInstallDirs
...
CMake contains a module for more granular installation directories:
https://cmake.org/cmake/help/latest/module/GNUInstallDirs.html
Let’s set the paths so that projects using the module can be more
easily split into multiple outputs.
2018-12-25 20:51:31 +01:00
Matthew Bauer
d492f53faf
Merge pull request #50527 from matthewbauer/ninja-check-phase
...
Add check phase to ninja setup hook
2018-11-20 16:55:12 -06:00
Matthew Bauer
70e2b0bef0
cmake: also set CTEST_PARALLEL_LEVEL
2018-11-19 18:14:44 -06:00
Matthew Bauer
285eb9a894
cmake: set CTEST_OUTPUT_ON_FAILURE globally
...
We should always use this.
2018-11-19 16:16:16 -06:00
Jan Malakhovski
fe50c0c096
cmake_2_8: fix fetchpatch src
...
Old link no longer works. There're other broken patches in that file,
but I was too lazy to investigate where one can download them now.
2018-11-17 10:16:30 +00:00
Vladimír Čunát
2d6179d1e8
Merge branch 'master' into staging
...
A few trivial conflicts due to *Platforms mass replace.
2018-09-01 17:38:18 +02:00
Uli Baum
8aa09a2887
cmake_2_8: fix build, restore search-path.patch
...
cmake 3.12 update in #44910 modified search-path.patch
and broke cmake 2.8. This restores the previous version
of the patch as search-path-2.8.patch
2018-08-31 01:04:44 +02:00
John Ericson
0828e2d8c3
treewide: Remove usage of remaining redundant platform compatability stuff
...
Want to get this out of here for 18.09, so it can be deprecated
thereafter.
2018-08-30 17:20:32 -04:00
Vladimír Čunát
b71b222b4c
Merge #44910 : cmake: 3.11.2 -> 3.12.1
2018-08-30 16:04:52 +02:00
Andrew Childs
68ac282f8e
cmake: patch internal libuv to remove dependency on macOS Frameworks
2018-08-13 11:05:54 +09:00
Andrew Childs
e8144a30bb
cmake: remove additional versions
2018-08-13 11:05:54 +09:00
Andrew Childs
32cc3eb899
cmake: 3.11.2 -> 3.12.1
2018-08-13 11:05:54 +09:00
Matthew Bauer
e62996f65c
cmake: add bsd3 license
2018-08-06 10:15:55 -04:00
volth
52f53c69ce
pkgs/*: remove unreferenced function arguments
2018-07-21 02:48:04 +00:00
Orivej Desh
e7facc718e
cmake: fix build with libuv 1.21 ( #43052 )
2018-07-04 23:03:59 +00:00
Orivej Desh
7f3de60758
Merge branch 'master' into staging
...
* master: (161 commits)
pcsclite: clean up after #41790
tor: 0.3.3.6 -> 0.3.3.7
opae: init at 1.0.0
tinc: 1.0.33 -> 10.0.34
tinc_pre: 1.1pre15 -> 1.1pre16
sit: 0.3.2 -> 0.4.0 (#41863 )
platforms/raspberrypi: enable kernelAutoModules
libupnp: 1.6.21 -> 1.8.3 (#41684 )
androidStudioPackages.{dev,canary}: 3.2.0.16 -> 3.2.0.17
tdesktop: 1.3.0 -> 1.3.7
gns3Packages.{server,gui}{Stable,Preview}: 2.1.6 -> 2.1.7
aws-sam-cli: init at 0.3.0 (#41877 )
nixos/nat: optional networking.nat.externalInterface (#41864 )
linux: 4.17 -> 4.17.1
linux: 4.16.14 -> 4.16.15
linux: 4.14.48 -> 4.14.49
nixos/unbound: add restart (#41885 )
maintainers/create-azure.sh: remove hydra.nixos.org as binary cache (#41883 )
gshogi: init at 0.5.1 (#41840 )
neovim: add missing libiconv
...
2018-06-12 20:41:41 +00:00
Ben Gamari
5962d0d5f3
cmake: Only apply application-services.patch with 3.11
...
The patch doesn't apply with earlier versions. Fixes #41816 .
2018-06-10 21:32:49 -04:00
Matthieu Coudron
a6809c0dd0
cmake: don't override cmakeDir when set ( #40687 )
...
When dontUseCmakeBuildDir is true (aka the default), it overrides
cmakeDir regardless of the package configuration.
While packaging netbee, I needed to both keep dontUseCmakeBuildDir to
true (some hardcoded paths expect the build folder) and set cmakeDir
(since CMakeList.txt was in a subfolder) which proved impossible.
Here is the fix.
2018-06-03 12:28:28 +00:00
Orivej Desh
83c98f3656
cmake_2_8: fix build after #28029
2018-05-29 14:16:06 +00:00
Daiderd Jordan
02dcc8d734
cmake: fix darwin build
...
HAVE_APPLICATION_SERVICES always gets set if cmake is available.
2018-05-28 13:46:45 +02:00
Thomas Tuegel
75e78eda1f
cmake: 3.10.2 -> 3.11.2
...
Fixes #40751 .
2018-05-19 18:28:01 -05:00
John Ericson
ce018be2d6
Merge pull request #40566 from obsidiansystems/strictDeps-for-18.03
...
cmake: Fix build and setup hook
2018-05-15 16:31:17 -04:00
John Ericson
0ff650a392
cmake: Fix build and setup hook
...
I screwed this up in 330ca731e8
. I'm
sorry.
2018-05-15 15:24:22 -04:00
John Ericson
5e17335bd7
Merge remote-tracking branch 'upstream/staging' into strictDeps
2018-05-14 23:33:03 -04:00
John Ericson
330ca731e8
treewide: Get rid of all uses of crossConfig
...
The hack of using `crossConfig` to enforce stricter handling of
dependencies is replaced with a dedicated `strictDeps` for that purpose.
(Experience has shown that my punning was a terrible idea that made more
difficult and embarrising to teach teach.)
Now that is is clear, a few packages now use `strictDeps`, to fix
various bugs:
- bintools-wrapper and cc-wrapper
2018-05-14 23:30:37 -04:00
Matthew Justin Bauer
eeb016e8f0
Merge branch 'staging' into fix-ncurses-darwin-extensions
2018-05-02 15:40:38 -05:00
Ryan Mulligan
038a0c9a60
treewide: http to https
2018-04-30 21:39:20 -07:00
Jan Malakhovski
7438083a4d
tree-wide: disable doCheck
and doInstallCheck
where it fails (the trivial part)
2018-04-25 04:18:46 +00:00
Matthew Justin Bauer
75616ceb49
Merge pull request #37840 from matthewbauer/unixtools
...
Cross-platform "unixtools"
2018-03-27 18:43:03 -05:00
Matthew Bauer
49455d7bae
treewide: replace utillinux refs of {u,}mount
...
umount and mount are now provided top-level
2018-03-27 18:17:46 -05:00
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