Unverified Commit caade838 authored by Austin Horstman's avatar Austin Horstman
Browse files

treewide: unpin apple-sdk_11

parent 013bcf29
Loading
Loading
Loading
Loading
+17 −23
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@
  python3,
  asciidoctor,
  libgit2,
  apple-sdk_11,
  wrapGAppsHook3,
  installShellFiles,
  buildPlugins ? true,
@@ -46,8 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
    installShellFiles
  ];

  buildInputs =
    [
  buildInputs = [
    zlib
    libjpeg
    wxGTK32
@@ -63,11 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
    glib
    libgit2
    python3
    ]
    ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 ]
    ++ lib.optionals stdenv.hostPlatform.isDarwin [
      apple-sdk_11
    ];
  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 ];

  doCheck = true;

+1 −2
Original line number Diff line number Diff line
{
  apple-sdk_11,
  fetchFromGitHub,
  fetchpatch, # Delete at next version bump.
  lib,
@@ -53,7 +52,7 @@ stdenv.mkDerivation rec {

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

  installPhase = ''
    runHook preInstall
+10 −13
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@
  freetype,
  alsa-lib,
  libjack2,
  apple-sdk_11,
}:

stdenv.mkDerivation (finalAttrs: {
@@ -49,8 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
    pkg-config
  ];

  buildInputs =
    lib.optionals stdenv.hostPlatform.isLinux [
  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
    libX11
    libXext
    libXcursor
@@ -59,8 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
    freetype
    alsa-lib
    libjack2
    ]
    ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
  ];

  # JUCE insists on only dlopen'ing these
  NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isLinux (toString [
+9 −12
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@
  libsoup_2_4,
  webkitgtk_4_0,
  gst_all_1,
  apple-sdk_11,
}:

rustPlatform.buildRustPackage rec {
@@ -51,8 +50,7 @@ rustPlatform.buildRustPackage rec {
    ++ lib.optionals stdenv.hostPlatform.isLinux [ wrapGAppsHook3 ]
    ++ lib.optionals stdenv.hostPlatform.isDarwin [ makeBinaryWrapper ];

  buildInputs =
    lib.optionals stdenv.hostPlatform.isLinux [
  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
    openssl
    libsoup_2_4
    webkitgtk_4_0
@@ -60,8 +58,7 @@ rustPlatform.buildRustPackage rec {
    gst_all_1.gst-plugins-base
    gst_all_1.gst-plugins-bad
    gst_all_1.gst-plugins-good
    ]
    ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
  ];

  doCheck = false; # many scoring tests fail

+0 −6
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@
  wxGTK32,
  makeWrapper,
  stdenv,
  apple-sdk_11,
  darwinMinVersionHook,
  waylandSupport ? false,
  x11Support ? stdenv.hostPlatform.isLinux,
  testers,
@@ -81,10 +79,6 @@ rustPlatform.buildRustPackage rec {
      libnotify
      libxkbcommon
    ]
    ++ lib.optionals stdenv.hostPlatform.isDarwin [
      apple-sdk_11
      (darwinMinVersionHook "10.13")
    ]
    ++ lib.optionals waylandSupport [
      wl-clipboard
    ]
Loading