1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 22:20:51 +00:00
Commit graph

309 commits

Author SHA1 Message Date
Vladimír Čunát ab15a62c68 Merge branch 'master' into closure-size
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Ryan Artecona 776c827842 otool: remove
The `otool` binary is provided by the `cctools` package (and `binutils`)
on darwin, which is properly packaged and compiled from source.

This old standalone `otool` was simply a symlink to `/usr/bin/otool`,
which notably depended on the user having already installed the Command
Line Tools via XCode, and would fail dependent builds if they hadn't.
2016-03-23 09:13:00 -04:00
zimbatm d9e60e4d43 htop: merge both implementations
htop 2.0+ is now cross-platform
2016-03-19 22:20:20 +00:00
Tuomas Tynkkynen 0cd08e7e02 HACK: darwin adv_cmds: Add a dummy 'out' output 2016-02-13 15:50:20 -05:00
Tuomas Tynkkynen 79738a639a treewide: Mass replace 'binutils-raw}/lib' to refer the 'out' output 2016-01-24 10:03:33 +02:00
Dan Peebles a3dcb3051d apple-source-releases: bump many packages to 10.10.5
This also changes the versioning scheme to be in more "human-meaningful"
terms, so instead of the internal release numbers we talk about 10.10.5
or 10.9.5.
2016-01-10 14:53:44 -05:00
Dan Peebles a63fa339a5 cctools-port: bump to 877.5 2016-01-10 12:16:43 -05:00
Yann Hodique 000fe58769 adv_cmds: fix typo in file name
adv_cmds archive actually contains BSDmakefile, not BSDMakefile. While
that probably doesn't matter in default installations, it does matter
for case-sensitive filesystems.
2015-12-13 12:02:42 -08:00
Jude Taylor d539d9c935 revert to __impureHostDeps where possible 2015-11-25 10:09:35 -08:00
Jude Taylor 32cb70bb07 propagate nothing for Kernel.framework since it exposes no library 2015-11-21 15:59:43 -08:00
Jude Taylor 4cd86cb068 in cf-private, use correct path to CoreFoundation 2015-11-21 15:55:19 -08:00
Jude Taylor f5609a4d2a reintroduce impure host deps to all derivations 2015-11-21 15:51:48 -08:00
Jude Taylor 69e7f3bb74 switch to zero underscores for sandbox profiles; remove generateFrameworkProfile 2015-11-21 12:10:33 -08:00
Jude Taylor a63346e33c use single underscore for sandboxProfile 2015-11-21 11:17:30 -08:00
Jude Taylor df80090d09 use per-derivation sandbox profiles 2015-11-19 11:31:06 -08:00
Jude Taylor 914e9baefe start on sandbox stuff 2015-11-19 11:31:06 -08:00
Jude Taylor 7161be03c4 add libutil into darwin.Libsystem 2015-11-04 10:49:19 -08:00
Jude Taylor 74c99a9600 remove _main from CoreFoundation 2015-11-03 02:12:58 -08:00
Jude Taylor ce4f1098ca reduce security setup hook duplication 2015-10-29 13:56:02 -07:00
Henry Till 3374d9f90d htop: fix on darwin 2015-10-29 00:40:30 -07:00
Jude Taylor 3b2b2ab046 wxmac: clean up and provide with stub packages 2015-10-28 17:36:20 -07:00
Jude Taylor b3898c586a remove duplicate Kernel 2015-10-28 17:15:40 -07:00
Jude Taylor 74416dc40a wxmac: fix build 2015-10-28 17:15:16 -07:00
Henry Till a7784cafa3 SDL: fix on darwin 2015-10-28 19:44:30 -04:00
Jude Taylor de0182ee59 vim: clean up arguments list 2015-10-28 13:40:10 -07:00
Jude Taylor 5207f6b45c clean up emacs framework dependencies 2015-10-28 13:34:53 -07:00
Jude Taylor 62ac96fdca add ForceFeedback impure-deps 2015-10-28 13:34:53 -07:00
Jude Taylor c62cf0b5b3 add propagated builds where needed to darwin frameworks 2015-10-28 13:34:53 -07:00
Jude Taylor 31fa564076 libunwind is included in libSystem; disable build, copy headers only 2015-10-28 13:34:53 -07:00
Jude Taylor 33db336914 add more needed headers to cf-private 2015-10-28 13:34:53 -07:00
Jude Taylor 6eaf7d318e build libunwind for real 2015-10-28 13:34:53 -07:00
Jude Taylor 5ea8770263 cf-private: prepend self to system includes 2015-10-26 17:13:29 -07:00
Jude Taylor 0a23e412b4 in darwin sdk, copy headers rather than linking them 2015-10-26 17:13:29 -07:00
Jude Taylor 3ff552fabe libdispatch: add os private header 2015-10-23 10:34:17 -07:00
Jude Taylor 657b1ccc47 darwin: repair QuartzCore paths 2015-10-22 09:47:20 -07:00
Jude Taylor a7f09b201e fix filepaths for darwin.security_tool 2015-10-15 20:49:29 -07:00
Jude Taylor b345f70939 propagate cf-private with AppKit; fixes emacs and others 2015-10-11 12:09:27 -07:00
Jude Taylor 7283bb7466 introduce separate cf-private package to account for no CLT 2015-10-06 00:11:10 -07:00
Jude Taylor 0870c09854 darwin purity: emacs-24.5-mac 2015-09-30 17:14:43 -07:00
Eric Seidel 86b1a18721 Merge pull request #9405 from zimbatm/darwin-listing
Restore the listing of Darwin packages.
2015-09-25 13:50:44 -07:00
Jude Taylor 8a1b8a5b0a alias libtool to darwin.cctools on darwin 2015-09-20 13:08:38 -07:00
Jude Taylor d78936131a preparation for being able to build xquartz 2015-09-17 16:11:18 -07:00
Jude Taylor 9be2c355be remove 3 more outdated impure-deps 2015-09-14 17:54:15 -07:00
Jude Taylor b3b2928ca6 Revert "libsecurity_generic: add El Capitan impure-deps"
This reverts commit 557fa59042.
2015-09-12 11:59:08 -07:00
Jude Taylor f7cb16ff9b Revert "apple-sdk: add El Capitan impure-deps"
This reverts commit 3bf5d87f9e.
2015-09-12 11:58:59 -07:00
Jude Taylor 0d54f0de59 add new libs to impure-deps for CoreServices
affects nodejs, vim, etc.
2015-08-26 17:06:10 -07:00
Jude Taylor e5fe8aab74 add reattach-to-user-namespace 2015-08-25 19:03:49 -07:00
Jude Taylor 557fa59042 libsecurity_generic: add El Capitan impure-deps 2015-08-25 17:13:35 -07:00
Jude Taylor 3bf5d87f9e apple-sdk: add El Capitan impure-deps 2015-08-25 17:13:35 -07:00
Jude Taylor 881fd7f589 disable libsystem_stats (temporarily?) 2015-08-25 11:12:10 -07:00
Jude Taylor 16a615a0f6 IOKit: add 10.11-only dependency 2015-08-25 11:12:09 -07:00
zimbatm 5bf732bf4b Restore the listing of Darwin packages.
`nix-env -qaP -A pkgs.darwin`

pkgs.darwin.libutil:
  Commented-out because the package definition doesn't exist. The source
  doesn't even provide a Makefile...

pkgs.darwin.objc4_pure:
  Commented-out because the package is broken and referencing unknown
  applefetchsource and libc_old names. It doesn't seem to be used by any
  other packages too.
2015-08-23 13:58:32 +01:00
Eelco Dolstra aba76f23a5 Revert "add Darwin's flavor of lsof"
This reverts commit 7024b4dc62. It
breaks evaluation (possibly related to earlier reverts):

http://hydra.nixos.org/build/24887643
2015-08-21 12:05:06 +02:00
Jude Taylor ef95107ddc make isClang work the way a user might expect 2015-08-12 11:27:54 -07:00
Jude Taylor 7024b4dc62 add Darwin's flavor of lsof 2015-07-31 11:35:42 -07:00
Jude Taylor d3a4fe374f update framework impure deps 2015-07-11 16:05:04 -07:00
Jude Taylor 5f308b50e4 add system keychains to security-tool's propagated inputs 2015-07-11 16:05:04 -07:00
Jude Taylor 066412c7b0 clean up propagated stuff for x509-system 2015-07-10 10:41:08 -07:00
Jude Taylor 630bff3b7d remove unused security-tool deps file 2015-07-10 10:41:07 -07:00
Jude Taylor 0f763a12bf update PCSC dependencies 2015-07-10 10:41:07 -07:00
Jude Taylor 7851df4454 fix input propagation on security-tool 2015-07-10 10:41:07 -07:00
Jude Taylor 43c72cb6af add security-tool 2015-07-10 10:41:07 -07:00
Jude Taylor f72beea75e darwin purity: nodejs-0.10 2015-07-10 10:28:27 -07:00
Jude Taylor ce5afbbb26 update libiconv source hash 2015-07-08 14:15:04 -07:00
Jude Taylor 976d80eb57 map apple sdk frameworks CF to darwin.CF to avoid confusion 2015-07-08 14:15:04 -07:00
Jude Taylor 857efa12fb make vim frameworks-compliant 2015-06-30 17:34:13 -07:00
Jude Taylor 5429e06f58 move impure deps to a separate file 2015-06-30 16:29:05 -07:00
Jude Taylor a4fbe26ec8 darwin purity: haskell-hfsevents 2015-06-20 15:29:55 -07:00
Jude Taylor ee951a92d3 relocate adv_cmds 2015-06-18 12:37:42 -07:00
Jude Taylor fa9c81f694 pure darwin stdenv 2015-06-18 12:37:41 -07:00
Daiderd Jordan f119508140 darwin os-specific: rez and derez packages 2015-06-18 11:34:05 +02:00
Spencer Whitt 9119103656 command-line-tools: Update url 2015-05-18 15:10:33 -04:00
Spencer Whitt 165456bba2 command-line-tools: Update broken URL and packages
Close #7452.
2015-04-18 22:55:43 +02:00
Dan Peebles ecf662efc6 Flip cctools and cctools cross 2015-02-18 00:24:33 -05:00
Peter Simons 34413a142b pkgs/os-specific/darwin/osx-private-sdk: fix evaluation 2015-02-14 23:07:16 +01:00
Dan Peebles 3cb733779b Pretty sure nothing uses these, since they don't work (and we have a replacement in apple-source-releases) 2015-02-08 23:36:19 -05:00
Dan Peebles 1b2ae59102 This now lives elsewhere (the file was unreferenced) 2015-02-08 13:41:28 -05:00
Dan Peebles 29f265dfd2 Add a big bundle of packages from apple source releases. Many of them only provide headers or stubs, but are what's needed for the upcoming pure-darwin stdenv, and don't do any harm for now. 2015-02-08 01:53:52 -05:00
Dan Peebles e32950d11a Upgrade cctools port to 862, and fix the cross version so it evaluates 2015-02-08 01:11:03 -05:00
Eric Seidel ebb8d03f96 darwin-specific stuff 2015-02-03 14:06:13 -08:00
Domen Kožar efea92de19 fixes #1933 2014-10-23 00:14:09 +02:00
Daniel Peebles aa7839c145 Clean up command-line tools a bit to allow us to use an impure
hdiutil (for an upcoming bootstrapped stdenv for darwin!)

Closes #4382
2014-10-04 20:21:15 +01:00
Daniel Peebles c55c435ade Add Apple command-line tools
Closes #4365
2014-10-02 06:50:09 +01:00
Daniel Peebles 58ea86bd87 Let’s compile the Mac OS X SecurityTool ourselves 2014-09-30 01:14:14 -04:00
Eelco Dolstra 40f7b0f9df Another attempt to eradicate ensureDir
See c556a6ea46.
2014-06-30 14:56:10 +02:00
Joel Taylor 58971f7b14 add htop fork for darwin (close #2690)
@vcunat made it a single conditional attribute.

Conflicts (trivial):
	lib/maintainers.nix
2014-06-11 20:36:10 +02:00
aszlig 625d7b9043
Merge pull request #1928 from 'cross-win-osx'.
This includes a lot of fixes for cross-building to Windows and Mac OS X
and could possibly fix things even for non-cross-builds, like for
example OpenSSL on Windows.

The main reason for merging this in 14.04 already is that we already
have runInWindowsVM in master and it doesn't work until we actually
cross-build Cygwin's setup binary as the upstream version is a fast
moving target which gets _overwritten_ on every new release.

Conflicts:
	pkgs/top-level/all-packages.nix
2014-04-21 10:00:35 +02:00
Jaka Hudoklin 4eefc983a2 xcode: fix hash 2014-04-01 01:34:07 +02:00
Domen Kozar 059e8e179b set all licenses to be attributes (and wait for Nix 1.7) 2014-03-12 21:20:43 +01:00
aszlig a445199db4
xcode: Update to new version 5.1.
This version just got released two days ago, while we were working for
cross-builds on 5.0.2. From the release notes it shouldn't introduce any
incompatibilities.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-03-12 10:00:49 +01:00
aszlig a6621202af
xcode: Drop use of weak_import on enumerators.
GCC doesn't support attributes on enumerators, which could pose a
problem but fortunately not in this case. Here a
__attribute__((weak_import)) is used, which doesn't make much sense for
enumerators anyway (noone will die because the corresponding enumerator
won't be referenced either in older OS X versions).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-03-12 10:00:49 +01:00
aszlig 3940b21988
cctools-port: Pass through wrapped XCToolchain.
At the moment, this includes only dyldinfo, dwarfdump and dsymutil, but
we'll see whether we need more of these utilities later.

Tho reason those are wrapped in cctools-port is because it is the
binutils used to cross-compile for Mac OS X.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-03-12 10:00:46 +01:00
aszlig 45cd9994bc
darwin: Add new package maloader.
This is the mentioned Mach-O loader that we're yoing to use to execute
Apple's proprietary binaries.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-03-12 10:00:45 +01:00
aszlig 53a267e535
darwin: Add new package opencflite.
This provides a port of Mac OS X's CoreFoundation and is needed if we
want to be able to run dsymutil using maloader.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-03-12 10:00:45 +01:00
aszlig c0d55fcc6a
xcode: Provide the commandline toolchain as well.
This toolchain contains Mach-O binaries and might not be useful in the
first place, but there are programs like dsymutil, where Apple didn't
release the source code, so we need a Mach-O loader...

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-03-12 10:00:45 +01:00
aszlig dd10bb3181
Add a cross-platform port of cctools.
This basically is binutils for Mac OS X, but ported to work on
(GNU/)Linux and FreeBSD.

And it's up-to-date as well! I'm mentioning this, because it was quite
hard to find a recent port of it and I just accidentally stumbled on it
while trying to do the port by myself.

So thanks to @tpoechtrager for doing this.

Also, I've added two more patches, which essentially are:

 * ld-rpath-nonfinal:
     This allows -rpath to be used for linking non-final builds, which
     was allowed for earlier versions of cctools and got a check for
     that in more recent versions.

 * ld-ignore-rpath-link:
     Ignores the -rpath-link option, because the cross-wrapper uses it
     in different places. Unfortunately, the cctools linker doesn't
     support it, so we might need to implement this later if it's
     possible (I'm not a Mach-O man^H^H^Hexpert).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-03-12 10:00:44 +01:00
aszlig 83dd414ca2
Add new package for Apple's XCode.
This package provides the SDK and standard library needed for
cross-compiling to Mac US X. We're using xpwn here to extract the DMG.

Also, this version (XCode 5.0.2) only contains the SDKs for version 10.9
and 10.8, so we might need to add requireFile directives for older
versions as well.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-03-12 10:00:43 +01:00
Eric Kow 1be6aae4b4 darwin x11/opengl: only copy subset of files (close #1165)
Copy only the pc files related to X11 and OpenGL.

This should allow us to build our own version of libraries like
cairo without having the native ones be accidentally dynamically
linked in to things that depend on them.

Before this patch if we `dyldinfo -dylibs libpangocairo` we can
see that it was dynamically linked against the OS X (but seemingly
built against include files from the nix one, as we would get a
runtime complaint about missing symbols)
2013-11-07 10:39:28 +01:00
Peter Simons e761405c50 os-specific/darwin/setfile: drop the "unfree" license
Setfile is included by other derivation, which in turns makes them unfree, too.
This causes plenty of evaluation errors on Hydra, i.e.:

  at `haskellPackages_ghc763_profiling.wx.x86_64-darwin' [nixpkgs = ..., officialRelease = false]:
  user-thrown exception: package ‘setfile’ has an unfree license, refusing to evaluate

Now, it's true that "setfile" is unfree, but this doesn't affect us: our
derivation doesn't include the actual binary -- it just contains a symlink to
"/usr/bin/SetFile". Arguably, our setfile derivation is free and we can
re-distribute it.
2013-09-11 13:08:46 +02:00
Vladimír Čunát 11c8ca0a1a otool: fix licenses, adding the new APSL 2.0 as well
Now Hydra can build glib introspection and all that depends on it
(just darwin).
2013-08-13 07:34:37 +02:00
Rok Garbas 5d3a07f57e Merge pull request #723 from lovek323/darwin-tools
otool and setfile: cleanup
2013-07-07 04:49:04 -07:00
Jason "Don" O'Conal 525a6856f2 otool and setfile: cleanup 2013-07-07 18:58:29 +10:00
Jason "Don" O'Conal 2da7f32b25 install_name_tool: add expression 2013-07-06 19:14:45 +10:00
Peter Simons e5b51648b1 Move "darwin-native-x11-and-opengl" package into the "os-specific" hierarchy. 2013-01-30 14:53:04 +01: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
Peter Simons dd123060c0 Add an expression for Darwin's install_name_tool utility, which is required by several other builds.
svn path=/nixpkgs/trunk/; revision=26509
2011-03-25 12:55:15 +00:00
Peter Simons 85b7c134cb pkgs/os-specific/darwin/lipo: add support for running the native Darwin lipo utility
svn path=/nixpkgs/trunk/; revision=21426
2010-04-29 14:56:44 +00:00
Peter Simons 4d675a283e pkgs/development/interpreters/python/2.6/default.nix: fixed build on Darwin
svn path=/nixpkgs/trunk/; revision=18136
2009-11-05 13:44:30 +00:00
Peter Simons 90dd9d14bf python-2.6: fixed build on Darwin
* Dropped "nolongdouble.patch". The patch no longer applies to Python 2.6, and
   apparently isn't required anymore either.

 * Added access to native Darwin arch utility. Python tries to run 'arch' in
   the configure stage, but that binary reside in /usr/bin. To make it
   available to the expression, the small wrapper darwinArchUtility is added as
   a buildInput if appropriate.

 * Don't pass --enable-shared. The build fails if we try to enable building of
   shared libraries, apparently because some required libraries aren't linked,
   i.e. the linker call isn't right.

TODO:

 * Figure out how to enable shared linking.

 * The resulting binary on Darwin seem to lack the binascii module.

svn path=/nixpkgs/trunk/; revision=17894
2009-10-20 12:13:49 +00:00