Unverified Commit 5209768e authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

treewide: unpin apple-sdk_11 pt 3 (#370472)

parents d3525a11 ae433b68

pkgs/by-name/rb/rbw/package.nix

+1 −9
Original line number Diff line number Diff line
@@ -6,9 +6,7 @@ 
  openssl,

  pkg-config,

  installShellFiles,

  darwin,

  bash,

  apple-sdk_11,

  # rbw-fzf

  withFzf ? false,

  fzf,
@@ -39,13 +37,7 @@ rustPlatform.buildRustPackage rec { 
    installShellFiles

  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ];



  buildInputs =

    [ bash ] # for git-credential-rbw

    ++ lib.optionals stdenv.hostPlatform.isDarwin [

      apple-sdk_11 # Needs _NSPasteboardTypeFileURL, can be removed once x86_64-darwin defaults to a higher SDK

      darwin.apple_sdk_11_0.frameworks.Security

      darwin.apple_sdk_11_0.frameworks.AppKit

    ];

  buildInputs = [ bash ]; # for git-credential-rbw



  preConfigure = lib.optionalString stdenv.hostPlatform.isLinux ''

    export OPENSSL_INCLUDE_DIR="${openssl.dev}/include"

pkgs/by-name/re/rehex/package.nix

+1 −3
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 
  lua53Packages,

  perlPackages,

  gtk3,

  apple-sdk_11,

}:



stdenv.mkDerivation rec {
@@ -50,8 +49,7 @@ stdenv.mkDerivation rec { 
      perl

      TemplateToolkit

    ])

    ++ lib.optionals stdenv.hostPlatform.isLinux [ gtk3 ]

    ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];

    ++ lib.optionals stdenv.hostPlatform.isLinux [ gtk3 ];



  makeFlags = [

    "prefix=${placeholder "out"}"

pkgs/by-name/re/rerun/package.nix

+8 −16
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
  openssl,

  vulkan-loader,

  wayland,

  apple-sdk_11,



  versionCheckHook,
@@ -63,21 +62,14 @@ rustPlatform.buildRustPackage rec { 
    rustfmt

  ];



  buildInputs =

    [

  buildInputs = [

    freetype

    glib

    gtk3

    (lib.getDev openssl)

    libxkbcommon

    vulkan-loader

    ]

    ++ lib.optionals stdenv.hostPlatform.isLinux [ (lib.getLib wayland) ]

    ++ lib.optionals stdenv.hostPlatform.isDarwin [

      # Undefined symbols for architecture x86_64: "_NSAccessibilityTabButtonSubrole"

      # ld: symbol(s) not found for architecture x86_64

      apple-sdk_11

    ];

  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ (lib.getLib wayland) ];



  addDlopenRunpaths = map (p: "${lib.getLib p}/lib") (

    lib.optionals stdenv.hostPlatform.isLinux [

pkgs/by-name/re/rewatch/package.nix

+0 −6
Original line number Diff line number Diff line
@@ -3,8 +3,6 @@ 
  rustPlatform,

  fetchFromGitHub,

  nix-update-script,

  apple-sdk_11,

  stdenv,

}:



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


  cargoHash = "sha256-cZTA50gm7o+vBaRNjpZI0LQkXaHIukVTBXoYMUubZgw=";



  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [

    apple-sdk_11

  ];



  doCheck = true;



  passthru.updateScript = nix-update-script { };

pkgs/by-name/ri/ride/package.nix

+0 −3
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 
  copyDesktopItems,

  makeDesktopItem,

  electron,

  apple-sdk_11,

}:



buildNpmPackage rec {
@@ -70,8 +69,6 @@ buildNpmPackage rec { 
    makeWrapper

  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ copyDesktopItems ];



  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];



  env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";



  # our patch adds the platform detecting build option