diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2019-02-06 20:13:51 -0500 |
---|---|---|
committer | Matthew Bauer <mjbauer95@gmail.com> | 2019-04-20 23:17:04 -0400 |
commit | d69cc779b520ea74a5b52fa5691f3f8fd7fe9cf3 (patch) | |
tree | 7ec6f7707d70df2aee4260ec7b90e88ba59b84cb /pkgs/development | |
parent | 4c3c8f4a7d5d82e3a148819d8c80bdef6bcb0c6f (diff) | |
download | nixpkgs-d69cc779b520ea74a5b52fa5691f3f8fd7fe9cf3.tar nixpkgs-d69cc779b520ea74a5b52fa5691f3f8fd7fe9cf3.tar.gz nixpkgs-d69cc779b520ea74a5b52fa5691f3f8fd7fe9cf3.tar.bz2 nixpkgs-d69cc779b520ea74a5b52fa5691f3f8fd7fe9cf3.tar.lz nixpkgs-d69cc779b520ea74a5b52fa5691f3f8fd7fe9cf3.tar.xz nixpkgs-d69cc779b520ea74a5b52fa5691f3f8fd7fe9cf3.tar.zst nixpkgs-d69cc779b520ea74a5b52fa5691f3f8fd7fe9cf3.zip |
Revert "Revert "darwin 10.12 commits""
This reverts commit 8505e710e707b2e425379dc356721194f742d8d0.
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/haskell-modules/configuration-nix.nix | 19 | ||||
-rw-r--r-- | pkgs/development/tools/xcbuild/toolchains.nix | 1 |
2 files changed, 1 insertions, 19 deletions
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index af5bd2220d4..1be90f902e6 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -128,25 +128,6 @@ self: super: builtins.intersectAttrs super { # the system-fileio tests use canonicalizePath, which fails in the sandbox system-fileio = if pkgs.stdenv.isDarwin then dontCheck super.system-fileio else super.system-fileio; - # Prevents needing to add `security_tool` as a run-time dependency for - # everything using x509-system to give access to the `security` executable. - x509-system = if pkgs.stdenv.hostPlatform.isDarwin && !pkgs.stdenv.cc.nativeLibc - then let inherit (pkgs.darwin) security_tool; - in pkgs.lib.overrideDerivation (addBuildDepend super.x509-system security_tool) (drv: { - # darwin.security_tool is broken in Mojave (#45042) - - # We will use the system provided security for now. - # Beware this WILL break in sandboxes! - - # TODO(matthewbauer): If someone really needs this to work in sandboxes, - # I think we can add a propagatedImpureHost dep here, but I’m hoping to - # get a proper fix available soonish. - postPatch = (drv.postPatch or "") + '' - substituteInPlace System/X509/MacOS.hs --replace security /usr/bin/security - ''; - }) - else super.x509-system; - # https://github.com/NixOS/cabal2nix/issues/136 and https://github.com/NixOS/cabal2nix/issues/216 gio = disableHardening (addPkgconfigDepend (addBuildTool super.gio self.buildHaskellPackages.gtk2hs-buildtools) pkgs.glib) ["fortify"]; glib = disableHardening (addPkgconfigDepend (addBuildTool super.glib self.buildHaskellPackages.gtk2hs-buildtools) pkgs.glib) ["fortify"]; diff --git a/pkgs/development/tools/xcbuild/toolchains.nix b/pkgs/development/tools/xcbuild/toolchains.nix index 92ff35ac8b5..e435f0978c5 100644 --- a/pkgs/development/tools/xcbuild/toolchains.nix +++ b/pkgs/development/tools/xcbuild/toolchains.nix @@ -67,6 +67,7 @@ runCommand "Toolchains" {} ('' done ln -s ${buildPackages.darwin.bootstrap_cmds}/bin/mig $toolchain/bin + mkdir -p $toolchain/libexec ln -s ${buildPackages.darwin.bootstrap_cmds}/libexec/migcom $toolchain/libexec ln -s ${mkdep-darwin-src} $toolchain/bin/mkdep '') |