Unverified Commit 850540c4 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

treewide: unpin apple-sdk_11 pt 2 (#370471)

parents 241f922d 26d247b4
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@
  spirv-tools,
  gtest,
  glew,
  apple-sdk_11,
}:
let
  clientExecutable = "TaterClient-DDNet";
+0 −3
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@
, readline
, libxslt
, libxcrypt
, apple-sdk_11
, docbook-xsl-nons
, docbook_xml_dtd_45
}:
@@ -34,8 +33,6 @@ stdenv.mkDerivation rec {
    python3
    readline # required to build python
    libxcrypt
  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
    apple-sdk_11
  ];

  # otherwise the configure script fails with
+0 −4
Original line number Diff line number Diff line
{
  lib,
  stdenv,
  rustPlatform,
  fetchFromGitHub,
  installShellFiles,
  apple-sdk_11,
}:

rustPlatform.buildRustPackage rec {
@@ -20,8 +18,6 @@ rustPlatform.buildRustPackage rec {

  cargoHash = "sha256-ZKaq/JqH/Y2Cs9LLnlt1Gawe4R+kvS3vpUcNK95uujk=";

  buildInputs = lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;

  nativeBuildInputs = [ installShellFiles ];

  postInstall = ''
+10 −18
Original line number Diff line number Diff line
@@ -14,8 +14,6 @@
  secp256k1,
  zlib,
  nix-update-script,
  darwinMinVersionHook,
  apple-sdk_11,
}:

stdenv.mkDerivation rec {
@@ -41,8 +39,7 @@ stdenv.mkDerivation rec {
    pkg-config
  ];

  buildInputs =
    [
  buildInputs = [
    gperf
    libmicrohttpd
    libsodium
@@ -51,11 +48,6 @@ stdenv.mkDerivation rec {
    readline
    secp256k1
    zlib
    ]
    ++ lib.optionals stdenv.hostPlatform.isDarwin [
      # error: aligned allocation function of type 'void *(std::size_t, std::align_val_t)' is only available on macOS 10.13 or newer
      (darwinMinVersionHook "10.13")
      apple-sdk_11
  ];

  passthru.updateScript = nix-update-script { };
+1 −2
Original line number Diff line number Diff line
{
  lib,
  stdenv,
  apple-sdk_11,
  capnproto,
  extra-cmake-modules,
  fetchFromGitHub,
@@ -45,7 +44,7 @@ rustPlatform.buildRustPackage rec {
    openssl
    rust-jemalloc-sys
    zlib
  ] ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
  ];

  cargoBuildFlags = [
    "--package"
Loading