JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
188,128 Commits 2 Branches 0 Tags 12 GiB
58de4286d3
Commit Graph

211 Commits

Author SHA1 Message Date
worldofpeace
883a1dffcf
Merge pull request #52859 from jtojnar/cmake-gid 
cmake: use multiple outputs for GNUInstallDirs
 2019-07-25 16:05:10 -04:00
Daiderd Jordan
ed27ba064c
cmake: update ApplicationServices patch 2019-07-08 21:48:19 +02:00
Tobias Mayer
d87c843b6f Integrate review suggestions 2019-07-03 08:50:18 +02:00
Tobias Mayer
2608669904 cmake: 3.13.4 -> 3.14.5 2019-07-03 08:50:18 +02:00
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