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

treewide: unpin apple-sdk_11 pt 7 (#370478)

parents f7a0db08 cf23ef76
Loading
Loading
Loading
Loading
+3 −7
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@
  pkg-config,
  openssl,
  pcsclite,
  apple-sdk_11,
}:

rustPlatform.buildRustPackage rec {
@@ -31,12 +30,9 @@ rustPlatform.buildRustPackage rec {
    pkg-config
  ];

  buildInputs =
    [
  buildInputs = [
    openssl
    ]
    ++ lib.optionals stdenv.hostPlatform.isLinux [ pcsclite ]
    ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ pcsclite ];

  meta = with lib; {
    description = "YubiKey plugin for age";
+1 −6
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@
  wayland,
  xdg-utils,

  apple-sdk_11,
}:
let
  rpathLibs =
@@ -65,11 +64,7 @@ rustPlatform.buildRustPackage rec {
    scdoc
  ];

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

  outputs = [
    "out"
+9 −20
Original line number Diff line number Diff line
@@ -4,12 +4,9 @@
  buildGoModule,
  fetchzip,
  pkg-config,
  libicns,
  copyDesktopItems,
  makeDesktopItem,
  desktopToDarwinBundle,
  apple-sdk_11,
  darwinMinVersionHook,
  wayland,
  libxkbcommon,
  vulkan-headers,
@@ -44,15 +41,7 @@ buildGoModule rec {
      desktopToDarwinBundle
    ];

  buildInputs =
    if stdenv.hostPlatform.isDarwin then
      [
        apple-sdk_11
        # metal dependencies require 10.13 or newer
        (darwinMinVersionHook "10.13")
      ]
    else
      [
  buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [
    wayland
    libxkbcommon
    vulkan-headers
+0 −4
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@
  lib,
  SDL2,
  alsa-lib,
  apple-sdk_11,
  autoPatchelfHook,
  fetchFromGitHub,
  gtk3,
@@ -67,9 +66,6 @@ stdenv.mkDerivation (finalAttrs: {
      libpulseaudio
      openal
      udev
    ]
    ++ lib.optionals stdenv.hostPlatform.isDarwin [
      apple-sdk_11
    ];

  appendRunpaths = [ (lib.makeLibraryPath [ vulkan-loader ]) ];
+0 −2
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@
  wavpack,
  wxGTK32,
  gtk3,
  apple-sdk_11,
  libpng,
  libjpeg,
}:
@@ -144,7 +143,6 @@ stdenv.mkDerivation (finalAttrs: {
      util-linux
    ]
    ++ lib.optionals stdenv.hostPlatform.isDarwin [
      apple-sdk_11
      libpng
      libjpeg
    ];
Loading