John Ericson
bf7b521500
treewide: Fix some references to binutils
...
- Compiler's shouldn't use `binutils.dev` as that doesn't yet exist
with a cross binutils.
- Last two `binutils.binutils` which weren't reverted
2017-09-14 18:12:54 -04:00
Matthew Bauer
9111b53325
duti: init at 1.5.4pre
...
I would init at 1.5.4, but sadly it doesn’t work on OS X 10.11+.
2017-09-13 16:33:54 -05:00
Eelco Dolstra
ec8d41f08c
Revert "Merge pull request #28557 from obsidiansystems/binutils-wrapper"
...
This reverts commit 0a944b345e61733ed6cc
2017-09-07 12:51:21 +02:00
Frederik Rietdijk
d7ef196c26
Merge remote-tracking branch 'upstream/master' into HEAD
2017-09-05 10:11:06 +02:00
Tuomas Tynkkynen
e6a83ed89c
apple-source-releases: Add some meta.platforms
...
Or Hydra tries to build them on Linux...
2017-09-04 19:04:05 +03:00
Thomas Mader
2a0f1ecdc8
apple-sdk: Move cf-private first in list, otherwise the build fails because CoreFoundation/CFAttributedString.h could not be found.
...
The problem appeared when building ldc on Mac OSX. See also 13778.
2017-09-02 08:35:07 +02:00
John Ericson
b64736a8e4
darwin binutils: Unwrap GNU Binutils before splicing with cctools
2017-09-01 11:44:56 -04:00
Daiderd Jordan
adca58c2e7
Merge pull request #27598 from LnL7/darwin-cf-rpath
...
CoreFoundation: use rpath to fix issues when using frameworks
2017-08-29 22:16:56 +02:00
Vladimír Čunát
2858c41823
Merge branch 'master' into staging
...
There were some conflicts in python modules, commented at #28314 .
2017-08-29 10:51:54 +02:00
Daiderd Jordan
5a28fd660a
darwin-frameworks: move fixup setup-hook
2017-08-28 23:25:11 +02:00
Daiderd Jordan
cc1bfbd9a7
darwin-frameworks: use the system CF when frameworks are used
...
This will get propagated down to other libraries loaded because
everything in nixpkgs references CF based on an rpath entry.
2017-08-28 23:25:09 +02:00
Daiderd Jordan
92652b4d79
darwin-CF: use @rpath for library id and add an rpath entry for CF based on NIX_COREFOUNDATION_RPATH
2017-08-28 23:24:58 +02:00
John Ericson
7a22c01b54
apple misc pkgs: buildInputs -> nativeBuildInputs
2017-08-28 15:21:55 -04:00
Vladimír Čunát
a4c2613f3d
darwin.usr-include: set meta.platforms
...
Otherwise scripts may try to evaluate it and that fails due to
missing `stdenv.libc`.
2017-08-27 17:06:45 +02:00
John Ericson
056a389d3b
ios cross cc-wrapper: Fail assertion to avoid breaking tarball job
...
Previously, this wasn't being evaluated by CI.
2017-08-21 11:50:29 -04:00
davidak
3270aa896b
replace "Mac OS X" and "OS X" with "macOS"
...
as it is the official name since 2016
https://en.wikipedia.org/wiki/Macintosh_operating_systems#Desktop
exception are parts refering to older versions of macOS like
"GUI support for Mac OS X 10.6 - 10.12. Note that Emacs 23 and later [...]"
2017-08-07 21:41:30 +02:00
Silvan Mosberger
f5fa5fa4d6
pkgs: refactor needless quoting of homepage meta attribute ( #27809 )
...
* pkgs: refactor needless quoting of homepage meta attribute
A lot of packages are needlessly quoting the homepage meta attribute
(about 1400, 22%), this commit refactors all of those instances.
* pkgs: Fixing some links that were wrongfully unquoted in the previous
commit
* Fixed some instances
2017-08-01 22:03:30 +02:00
Dan Peebles
0419452113
Fix Darwin stdenv to work on 10.13
...
The main changes are in libSystem, which lost the coretls component in 10.13
and some hardening changes that quietly crash any program that uses %n in
a non-constant format string, so we've needed to patch a lot of programs that
use gnulib.
2017-07-11 21:56:38 -04:00
Domen Kožar
ca76954e49
Merge pull request #27245 from NixOS/osx_private_sdk/cleanup
...
Get rid of some usages of osx_private_sdk
2017-07-09 22:49:31 +02:00
Domen Kožar
e211504db6
Get rid of some usages of osx_private_sdk
...
For example this reduces haskell closure on
darwin for some packages for almost 500MB.
2017-07-09 22:48:04 +02:00
Ryan Trinkle
754c3f6ba4
cc-wrapper: fix response file parsing on ios-cross
2017-07-05 16:04:39 -04:00
John Ericson
95c8277701
misc pkgs: Remove unneeded *Platform == *Platform comparisons
...
PR #26007 used these to avoid causing a mass rebuild. Now that we know
things work, we do that to clean up.
2017-06-30 10:09:31 -04:00
John Ericson
f43ae985a6
ios-cross: Just properly use the cc-wrapper
...
No other downstream derivations are needed anymore.
2017-06-22 17:56:12 -04:00
Daiderd Jordan
91caa85804
darwin-Libsystem: include libplatform headers
2017-05-27 23:19:50 +02:00
Daiderd Jordan
815f25f31b
darwin-CF: 855.17 -> 1153.18
2017-05-27 23:19:49 +02:00
Daiderd Jordan
bf58495177
darwin-dispatch: 339.92.1 -> 442.1.4
2017-05-27 23:19:48 +02:00
Daiderd Jordan
857648dd31
darwin-libplatform: init at 125
2017-05-27 23:19:47 +02:00
Daiderd Jordan
ff1253200b
darwin-ICU: init at 531.48
2017-05-27 23:19:42 +02:00
John Ericson
2e7ec6fb70
lib: Make platform predicates more ergonomic to use
...
`hostPlatform.isDarwin` instead of `lib.system.parse.isDarwin
hostPlatform.parsed`
2017-05-22 00:25:02 -04:00
John Ericson
7018dfb9f4
binutils and cctools: Prefix derivation names with target for cross
...
We want platform triple prefixes and suffixes on derivation names to
be used consistently. The ideom this commit strives for is
- suffix means build != host, i.e. cross *built* packages. This is
already done.
- prefix means build != target, i.e. cross tools. This matches the
tradition of such binaries themselves being prefixed to disambiguate.]
Binutils and cctools, as build tools, now use the latter
2017-05-17 15:33:05 -04:00
John Ericson
88ea6463a3
binutils on darwin: Clean up the rats nest
...
- No more *Cross duplication for binutils on darwin either.
`cctools_cross` is merged into plain `cctools`, so `buildPackages`
chains alone are used to disambiguate.
- Always use a mashup of cctools and actual GNU Binutils as `binutils`.
Previously, this was only done in the native case as nobody had
bothered to implement the masher in the cross case. Implemented it
basically consisted of extending the wrapper to deal with prefixed
binaries.
2017-05-17 15:33:05 -04:00
John Ericson
db5a921945
crossStdenv on iphone: Just get info from targetPlatform
2017-04-24 16:12:26 -04:00
Vladimír Čunát
24444513fb
Merge branch 'staging'
2017-04-14 10:32:13 +02:00
Daniel Peebles
f21a6940da
Merge pull request #24838 from matthewbauer/ibtool
...
pinentry_mac: use xcbuild
2017-04-12 22:20:57 -04:00
Matthew Bauer
bb2eb5b0e8
ibtool: use xib2nib src
2017-04-11 03:22:32 -05:00
Dan Peebles
c595d5ed3d
cctools-port: 886 -> 895
2017-04-09 17:32:37 -04:00
Dan Peebles
d93f2c3865
darwin.libSystem: fix intermittent impurity bug
...
If you've seen issues with libsystem_symptoms.dylib,
this should fix that.
2017-04-09 09:39:30 -04:00
Matthew Bauer
34422f428d
ibtool: add to toolchain
...
- init package
- add into xcbuild/toolchain.nix
2017-04-09 04:27:21 -05:00
Matthew Bauer
a78af29ae7
install_name_tool: remove
...
cctools provides install_name_tool
2017-04-09 04:22:44 -05:00
Dan Peebles
3a9c217804
rtags: fix for clang/libc++ 4
...
This also fixes a missing header in the SDK that rtags needs to work
properly. The underlying cause is that C++ headers got shuffled around a
lot in libc++ 3.8 (I believe) and became more standards-compliant, which
led to a lot of C-compatible passthrough header files being added to it
like math.h, which defines some C++-compatible versions of standard
functions like signbit, while #include_next'ing the system math.h. In
this case, including the SDK was stuffing another math.h in front of the
libc++ shim, which led to all sorts of mysterious failures.
2017-04-04 08:07:52 -04:00
Periklis Tsirakidis
6414533391
darwin: cleanup obsolete sdks
2017-03-24 08:06:03 +01:00
Daiderd Jordan
5b5357ae1e
khd: remove g++ patch
2017-03-23 23:03:17 +01:00
Dan Peebles
5561abd556
libauto: more obscene hackery to make it work on LLVM 4
...
This sort of thing is going to get revamped to be less hackish soon but
for now I want it to work. In this particular case, libc++ 4 (and maybe
earlier) gets very upset if we're imprecise about our const markers, and
I guess libauto was careless. This fixes it (PtrPtrMap) to be correct.
2017-03-21 22:24:12 -04:00
Daniel Peebles
38a03817b0
Merge pull request #22571 from LnL7/darwin-frameworks-hook
...
add setup-hook to fix darwin frameworks
2017-03-15 11:33:23 -04:00
Dan Peebles
59b795c590
apple-sdk: 10.9 -> 10.10
...
This is a slightly less ambitious version of the (now reverted) commit
377cef8d16
2017-03-14 22:36:21 -04:00
Daiderd Jordan
97a3e7cf52
darwin-frameworks: don't use pure CF
2017-03-12 15:19:04 +01:00
Daiderd Jordan
9ac3a8a5af
khd: 2.0.0 -> 2.1.1
2017-03-04 19:38:31 +01:00
Daiderd Jordan
7bd49cded4
khd: 1.1.4 -> 2.0.0
2017-01-30 22:43:54 +01:00
Michael Raskin
e08cae373b
Merge branch 'master' into kwm
2017-01-24 17:59:56 +00:00
Michael Raskin
2bcc678f5a
Merge pull request #22070 from LnL7/khd
...
khd: init at v1.1.4
2017-01-24 17:58:50 +00:00
Daiderd Jordan
adfb7e1f13
kwm: init at 1.1.4
2017-01-24 08:31:11 +01:00
Shea Levy
4f9f00fcc9
Add function to build a ghc standalone archive (OSX/iOS only)
2017-01-23 18:35:03 -05:00
Daiderd Jordan
0f91cdc45f
kwm: init at 4.0.4
2017-01-23 21:45:01 +01:00
Daiderd Jordan
034d39b244
darwin: update shas, some sources where re-released with different metadata
2017-01-23 19:39:03 +01:00
Shea Levy
b82d6b3a0a
ios-cross: Expose the SDK directory via ccCross
2017-01-23 08:23:43 -05:00
Daiderd Jordan
c7d49e5f69
darwin: fixed eval of frameworks
2017-01-21 01:01:46 +01:00
Shea Levy
e70dcf6818
ios-cross: Bump sdk version, verify sdk install at build time
2017-01-20 14:10:15 -05:00
Daiderd Jordan
d6517b6e5e
Merge pull request #21898 from matthewbauer/darwintools
...
DarwinTools: init at 1
2017-01-15 10:11:39 +01:00
Jude Taylor
3f49c4f3ce
reattach-to-user-namespace: fix version
2017-01-10 12:21:43 -08:00
Jude Taylor
f2713ce805
update reattach-to-user-namespace
2017-01-10 11:51:03 -08:00
Matthew Bauer
6f72be9962
DarwinTools: init at 1
2017-01-08 02:28:44 -06:00
Daiderd Jordan
538d1b688a
stdenv: bootstrap cmake and python on darwin
2017-01-03 18:01:47 +01:00
Vladimír Čunát
2e03ae274d
Merge branch 'master' into staging
2016-12-22 11:28:56 +01:00
Aristid Breitkreuz
bb18e10ba0
Merge remote-tracking branch 'origin/master' into staging
2016-12-20 14:05:30 +01:00
Daiderd Jordan
fb2a7cd705
Revert "apple-sdk: 10.9 -> 10.11"
...
This reverts commit 377cef8d16
2016-12-20 12:33:27 +01:00
Dan Peebles
377cef8d16
apple-sdk: 10.9 -> 10.11
2016-12-19 19:47:24 -05:00
Vladimír Čunát
86e4c9ed46
Merge branch 'master' into staging
2016-12-17 20:29:25 +01:00
Daiderd Jordan
a01a5ed925
darwin.libunwind: fix source
...
Fixes #20977
since this was the same sha as the linux package nix just used that instead.
2016-12-15 21:11:04 +01:00
Daiderd Jordan
87b3918d0b
Merge pull request #21133 from matthewbauer/shell_cmds
...
shell_cmds: init at 198
2016-12-15 17:53:09 +01:00
Matthew Bauer
ac4f27666e
darwin.CoreOSMakefiles: remove
...
This wasn't being used and it was causing an error when evaluating:
error: attribute ‘CoreOSMakefiles’ missing, at /Users/mbauer/Projects/nixpkgs2/pkgs/os-specific/darwin/apple-source-releases/default.nix:140:71
2016-12-14 23:45:19 -06:00
Matthew Bauer
83c7660279
shell_cmds: init at 187
...
fixes #11707
2016-12-14 21:18:09 -06:00
Vladimír Čunát
b05b120779
Merge branch 'master' into staging
2016-12-09 19:11:05 +01:00
Anthony Cowley
1712366bac
apple-sdk: Include system cups libraries
...
The SDK includes cups header files, but not the libraries. The
`nixpkgs.cups` definition doesn't build on darwin due to the SDK being
too old. This change symlinks the system cups libraries into the old
SDK.
2016-12-07 23:14:38 +01:00
Tuomas Tynkkynen
f91458ca38
reattach-to-user-namespace: Set platforms
2016-12-05 02:36:54 +02:00
Matthew Bauer
bd57e32312
file_cmds: init at 264.1.1
2016-11-27 21:58:07 -06:00
Shea Levy
12cc39514e
ios-cross: Document known prefixes
2016-11-19 10:29:01 -05:00
Vladimír Čunát
b69f568f4c
Merge branch 'staging'
...
Hydra rebuild looks fine; only a few Darwin jobs is queued:
http://hydra.nixos.org/eval/1304891?compare=1304807
2016-11-19 04:35:51 +01:00
Shea Levy
6f1d4149d5
ios-cross: Fix for simulator
2016-11-18 18:14:20 -05:00
Shea Levy
64ec4dd87b
Add haskell packages set for cross ghc
2016-11-18 10:44:53 -05:00
Vladimír Čunát
5af7b82336
Merge branch 'master' into staging
...
To incorporate some larger security rebuilds (jasper).
2016-11-17 11:14:05 +01:00
Daniel Peebles
f6a7296499
Merge pull request #16540 from matthewbauer/xcbuild
...
xcbuild: add wrapper
2016-11-16 12:11:15 -05:00
Matthew Bauer
fc1f6f55ea
xcbuild: Get rid of developer.nix, move to wrapper
...
also:
- add custom outputs "specs" for xcbuild
- get rid of unneeded tools
- update xcbuild
- add more comments
- fixup xcbuild derivations
Affected xcbuild derivations include:
- adv_cmds
- network_cmds
- basic_cmds
2016-11-15 19:13:23 -06:00
Matthew Bauer
4685bd7853
xcbuild: update meta and comments
2016-11-15 19:13:22 -06:00
Matthew Bauer
25485ece2a
xcbuild: add name to platform.nix
2016-11-15 18:58:13 -06:00
Matthew Bauer
9f46587841
network_cmds: init at 481.20.1
...
Fixes #16764
2016-11-15 18:58:13 -06:00
Matthew Bauer
3b17d9e35e
developer_cmds: init at 62
2016-11-15 18:58:13 -06:00
Matthew Bauer
823772b056
Librpcsvc: init at 26
2016-11-15 18:58:12 -06:00
Matthew Bauer
4a01a37051
basic_cmds: init at 55
2016-11-15 18:58:12 -06:00
Matthew Bauer
a35b330f30
adv_cmds: move from all-packages
...
Use the old way with pkgs/os-specific/darwin/apple-source-releases/defuault.nix.
2016-11-15 18:58:11 -06:00
Matthew Bauer
1ee8685ee7
adv_cmds: add custom install phase
2016-11-15 18:58:10 -06:00
Matthew Bauer
f1897116d0
xcbuild: temporarily fix cflags/ldflags
...
This gets everything to build.
adv_cmds: remove NIX_LDFLAGS
- unneeded
2016-11-15 18:58:09 -06:00
Matthew Bauer
6c1858a93d
adv_cmds: Disable pkill.
...
pkill isn't building because of some missing headers:
- xpc/xpc.h
- os/base_private.h
- _simple.h
They are all available somewhere but not set up correctly in the Darwin
stdenv.
TODO: add pkill back in!
2016-11-15 18:58:09 -06:00
Matthew Bauer
8e301fab50
adv_cmds: add xcode derivation
2016-11-15 18:58:08 -06:00
Shea Levy
7df3d7446f
Add initial basic support for cross-compiling to iOS
2016-11-15 16:31:55 -05:00
Vladimír Čunát
b5e89fe9bf
Merge branch 'master' into staging
2016-11-15 00:20:19 +01:00
John Wiegley
aa23309a39
Add a patch for cctools to work with Xcode 8
2016-11-14 13:30:28 -08:00
Daiderd Jordan
52d4599b52
Revert "Update hash for xnu 3248.60.10, the tarball changed upstream, it seems."
...
This reverts commit 328ad17858
2016-11-14 16:21:59 +01:00
Rob Vermaas
328ad17858
Update hash for xnu 3248.60.10, the tarball changed upstream, it seems.
...
(cherry picked from commit 5ddaca179c
2016-11-14 08:16:00 +00:00
Daiderd Jordan
16a90832cd
darwin.Libsystem: export _mach_init_routine
2016-11-09 20:01:54 +01:00
Dan Peebles
4f8a1094bd
cctools: add patch I forgot
2016-10-17 08:51:48 -04:00
