Unverified Commit 17b2fbb6 authored by Emily's avatar Emily Committed by GitHub
Browse files

gtk4: fix x64 darwin (#351004)

parents e80a134a 0d75f35b

pkgs/development/libraries/gtk/4.x.nix

+9 −7
Original line number Diff line number Diff line
@@ -50,11 +50,12 @@ 
, cupsSupport ? stdenv.hostPlatform.isLinux

, compileSchemas ? stdenv.hostPlatform.emulatorAvailable buildPackages

, cups

, AppKit

, Cocoa

, libexecinfo

, broadwaySupport ? true

, testers

, apple-sdk

, apple-sdk_10_15

, darwinMinVersionHook

}:



let
@@ -131,9 +132,7 @@ stdenv.mkDerivation (finalAttrs: { 
    libXi

    libXrandr

    libXrender

  ]) ++ lib.optionals stdenv.hostPlatform.isDarwin [

    AppKit

  ] ++ lib.optionals trackerSupport [

  ]) ++ lib.optionals trackerSupport [

    tinysparql

  ] ++ lib.optionals waylandSupport [

    libGL
@@ -143,8 +142,6 @@ stdenv.mkDerivation (finalAttrs: { 
    xorg.libXinerama

  ] ++ lib.optionals cupsSupport [

    cups

  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [

    Cocoa

  ] ++ lib.optionals stdenv.hostPlatform.isMusl [

    libexecinfo

  ];
@@ -165,6 +162,11 @@ stdenv.mkDerivation (finalAttrs: { 
    # Required for GSettings schemas at runtime.

    # Will be picked up by wrapGAppsHook4.

    gsettings-desktop-schemas

  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [

    (darwinMinVersionHook "15.0")

  ] ++ lib.optionals (stdenv.hostPlatform.isDarwin

                   && lib.versionOlder apple-sdk.version "10.15") [

      apple-sdk_10_15

  ];



  mesonFlags = [

pkgs/top-level/all-packages.nix

+1 −3
Original line number Diff line number Diff line
@@ -20052,9 +20052,7 @@ with pkgs; 
    inherit (darwin.apple_sdk.frameworks) AppKit Cocoa QuartzCore;

  };













  gtk4 = callPackage ../development/libraries/gtk/4.x.nix {













    inherit (darwin.apple_sdk.frameworks) AppKit Cocoa;













  };













  gtk4 = callPackage ../development/libraries/gtk/4.x.nix { };











































  # On darwin gtk uses cocoa by default instead of x11.