Jörg Thalheim
066db11215
Revert "Merge pull request #83099 from marsam/fix-buildGoModule-packages-darwin"
...
This reverts commit 4e6bf03504
, reversing
changes made to afd997aab6
.
Instead we propagate those frameworks from the compiler again
2020-03-27 07:33:21 +00:00
Mario Rodas
78f00558e2
smimesign: fix build on darwin
2020-03-21 06:22:00 -05:00
Daiderd Jordan
3987ea9a9d
mpv: add flag for swift on darwin
...
While we currently don't have a pure swift build on macOS it's possible
to build mpv using the swift compiler from CLT. eg.
self: super:
let
CommandLineTools = "/Library/Developer/CommandLineTools";
in
{
swift = super.stdenv.mkDerivation {
name = "swift-CommandLineTools-0.0.0";
phases = [ "installPhase" "fixupPhase" ];
propagatedBuildInputs = [ self.darwin.DarwinTools ];
installPhase = ''
mkdir -p $out/bin $out/lib
ln -s ${CommandLineTools}/usr/bin/swift $out/bin
ln -s ${CommandLineTools}/usr/lib/swift $out/lib
ln -s ${CommandLineTools}/SDKs $out
'';
setupHook = builtins.toFile "hook" ''
addCommandLineTools() {
echo >&2
echo "WARNING: this is impure and unreliable, make sure the CommandLineTools are installed!" >&2
echo " $ xcode-select --install" >&2
echo >&2
[ -d ${CommandLineTools} ]
export NIX_LDFLAGS+=" -L@out@/lib/swift/macosx"
export SWIFT=swift
export SWIFT_LIB_DYNAMIC=@out@/lib/swift/macosx
export MACOS_SDK_VERSION=$(sw_vers -productVersion | awk -F. '{print $1 "." $2}')
export MACOS_SDK=@out@/SDKs/MacOSX$MACOS_SDK_VERSION.sdk
}
prePhases+=" addCommandLineTools"
'';
__impureHostDeps = [ CommandLineTools ];
};
mpv = super.mpv.override { swiftSupport = true; };
}
2020-02-06 14:15:35 +01:00
Daiderd Jordan
6567823996
stdenv: introduce appleSdkVersion and macosVersionMin
2020-01-31 21:52:11 +01:00
hlolli
78b34b5e5b
graalvm8: 19.1.1 -> 19.2.1
...
- - nixpkgs now with full darwin support
2020-01-18 16:43:03 +01:00
Frederik Rietdijk
bc18cc72dd
Merge pull request #77610 from LnL7/darwin-stdenv-python3
...
darwin-stdenv: bootstrap with python3
2020-01-15 09:24:57 +01:00
Daiderd Jordan
c05efedd4d
darwin.iproute2mac: explicitly use python2
2020-01-13 11:41:23 +01:00
Daiderd Jordan
da6bc4b4cb
darwin.libtapi: python2 -> python3
2020-01-13 11:41:23 +01:00
Daiderd Jordan
73db5d8c38
darwin.apple_sdk: python2 -> python3
2020-01-13 11:13:57 +01:00
Daiderd Jordan
453e009947
darwin.CF: python2 -> python3
2020-01-13 11:13:06 +01:00
Daiderd Jordan
c7d457c9da
darwin.xnu: python2 -> python3
2020-01-13 11:13:01 +01:00
Vladimír Čunát
5c780036c5
Merge branch 'master' into staging-next
...
The nss rebuild isn't so small.
2020-01-08 22:48:13 +01:00
squalus
9314327dee
keepassxc: fix darwin build
...
- Removed the unnecessary libmicrohttpd dependency, which doesn't
build on macOS. KeepassXC removed this dependency in 2.1.2
- Fixed a compiler error related to the Touch ID feature by adding a
dependency on the LocalAuthentication framework
2020-01-08 16:44:14 +01:00
Greg Pevnev
a17dbd86ad
reattach-to-user-namespace: 2.7 -> 2.8
...
Add macOS Catalina (10.15) "support".
2020-01-08 13:50:08 +03:00
Matthew Bauer
04000331c1
Merge pull request #74284 from matthewbauer/ios-with-xcode-11
...
Update iOS for XCode 11
2020-01-03 15:35:41 -05:00
Matthew Bauer
9c1a2ac51e
Merge remote-tracking branch 'origin/master' into ios-with-xcode-11
2020-01-03 15:34:20 -05:00
Matthew Bauer
8b41b16a9f
cctools: fixup gnu-config detection
2020-01-03 15:20:55 -05:00
Matthew Bauer
6f8b2f3961
cctools: only add libtool on native builds
...
libtool is not really needed and it interferes with
updateAutotoolsGnuConfigScriptsHook. So remove it when
cross-compiling, but leave it in native to preserve hashes.
2020-01-03 15:20:54 -05:00
Matthew Bauer
010d2f4aa2
lib/systems: use newer ios sdk
2020-01-03 15:20:54 -05:00
Matthew Bauer
3432b1baa8
xcode: don’t use libstdc++ on iOS
...
Apple no longer ships with it, so best to avoid forcing it into use.
2020-01-03 15:19:34 -05:00
John Ericson
28c37155d7
xcode: Add more hashes, and fix some old ones
2020-01-03 15:19:08 -05:00
Robin Gloster
edfdd0f3e4
darwin: use dontUnpack instead of phases
2019-12-31 01:24:10 +01:00
Robin Gloster
bb2a6f7396
treewide: structured attrs fixes
2019-12-31 00:51:41 +01:00
Merijn Broeren
133103d709
treewide: replace make/build/configure/patchFlags with nix lists
2019-12-30 12:58:11 +01:00
Daiderd Jordan
d5d8b3514d
darwin.CF: fix retry condition (close PR #75528 )
...
Using a function in an if condition when set -e is set doesn't seem to
break out or return false which means the workaround from 41ca86129f
never gets triggered.
2019-12-12 08:16:32 +01:00
Denis Redozubov
7233afc886
apple_sdk: broken link update ( #73984 )
2019-11-27 14:17:43 -05:00
Matthew Bauer
fa383dcb7c
cctools: fixup gnu-config detection
...
Use autoreconfHook instead of preConfigure autogen.sh. This avoids
getting the bad version of the gnu-config script and makes the newish
iOS triples work.
2019-11-27 10:04:32 -05:00
Matthew Bauer
848d4a08a0
cctools: readd ld-rpath-nonfinal patch
...
This patch is needed to build ghc, which adds -rpath flags for some
reason. Updated patch for newest cctools and reapplied.
2019-11-27 10:01:57 -05:00
Matthew Bauer
08d6c4019d
Merge remote-tracking branch 'origin/staging' into dnicponski/scratch/update_darwin_cctools
2019-11-25 22:00:13 -05:00
Matthew Bauer
0c6a0c817a
cctools: only add libtool on native builds
...
libtool is not really needed and it interferes with
updateAutotoolsGnuConfigScriptsHook. So remove it when
cross-compiling, but leave it in native to preserve hashes.
2019-11-25 21:57:56 -05:00
Matthew Bauer
f0f4f90847
libtapi: bump to 1000.10.8
2019-11-25 21:57:39 -05:00
John Ericson
6d3b7458cc
Merge pull request #74065 from Ericson2314/cc-versions
...
compilers, binutils: Add version and pname
2019-11-24 18:35:13 -05:00
John Ericson
ef328622e0
cctools, darwin biutils: Use pname and version
2019-11-24 18:36:40 +00:00
Dave Nicponski
7b77c09e40
darwin.cctools: 895 -> 927.0.2
...
Update the version of `cctools` on darwin. The older version fails
to work on some modern packages, such as `bazel 1.1`.
2019-11-19 09:20:13 -05:00
Daiderd Jordan
41ca86129f
darwin.CF: workaround intermittent CFRuntime.c failures
...
Based on testing this issue seems to only occur with clang_7, so
we should be able to revert this when the default llvm versions are
updated.
Fixes #66811
2019-11-17 14:55:00 +01:00
John Ericson
f1481f2c90
apple-sdk setup hooks: NIX_CFLAGS_COMPILE may be undefined
2019-11-08 13:28:59 -05:00
John Ericson
beda0365a6
darwin private frameworks setup hook: NIX_CFLAGS_COMPILE may be undefined
2019-11-08 13:24:20 -05:00
Jason Felice
e4c34f2db4
osxsnarf: init at 0.1.0
2019-10-30 08:57:59 -07:00
volth
8276314608
treewide: fix string escapes
2019-09-16 22:15:38 +00:00
Nikita Voloboev
8b75a0a25f
wifi-password: init at 0.1.0 ( #68373 )
...
* wifi-password: init at 0.1.0
* Apply suggestions from code review
Co-Authored-By: symphorien <symphorien@users.noreply.github.com>
2019-09-10 00:40:05 +02:00
volth
08f68313a4
treewide: remove redundant rec
2019-08-28 11:07:32 +00:00
Frederik Rietdijk
5061fe0c2c
Merge staging-next into staging
2019-08-28 08:26:42 +02:00
Frederik Rietdijk
98640fd482
Merge master into staging-next
2019-08-27 16:36:47 +02:00
volth
35d68ef143
treewide: remove redundant quotes
2019-08-26 21:40:19 +00:00
Robin Gloster
64f6a951eb
darwin.network_cmds: pin to openssl 1.0.2
2019-08-26 01:31:10 +02:00
Frederik Rietdijk
fe9a3e3e63
Merge staging-next into staging
2019-08-17 09:39:23 +02:00
volth
46420bbaa3
treewide: name -> pname (easy cases) ( #66585 )
...
treewide replacement of
stdenv.mkDerivation rec {
name = "*-${version}";
version = "*";
to pname
2019-08-15 13:41:18 +01:00
Robert Winslow
e91d400dff
darwin.adv_cmds: Fix fetchzip call by using https not http ( #64546 )
2019-08-14 10:24:34 -04:00
Frederik Rietdijk
7cf5909fad
Merge staging-next into staging
2019-07-09 15:44:08 +02:00
Eric Norris
de9bf55774
smimesign: init at v0.0.13
2019-07-04 12:43:43 -04:00