From 82b8393bc4d102ea31b03d05fa0f3d2026e9976d Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 9 Apr 2019 21:44:38 -0400 Subject: [PATCH] tk: use aqua backend on darwin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Most users don’t have xquartz, so let’s use the default window system for macOS. --- pkgs/development/libraries/tk/generic.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/tk/generic.nix b/pkgs/development/libraries/tk/generic.nix index b3cc2b7506b..d5eaff77c11 100644 --- a/pkgs/development/libraries/tk/generic.nix +++ b/pkgs/development/libraries/tk/generic.nix @@ -1,4 +1,6 @@ -{ stdenv, src, pkgconfig, tcl, libXft, fontconfig, patches ? [], ... }: +{ stdenv, lib, src, pkgconfig, tcl, libXft, fontconfig, patches ? [] +, enableAqua ? stdenv.isDarwin, darwin +, ... }: stdenv.mkDerivation { name = "tk-${tcl.version}"; @@ -21,15 +23,14 @@ stdenv.mkDerivation { configureFlags = [ "--with-tcl=${tcl}/lib" - ]; + ] ++ stdenv.lib.optional enableAqua "--enable-aqua"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ] - ++ stdenv.lib.optional stdenv.isDarwin fontconfig; propagatedBuildInputs = [ tcl libXft ]; - - NIX_CFLAGS_LINK = if stdenv.isDarwin then "-lfontconfig" else null; + buildInputs = lib.optional enableAqua (with darwin; with apple_sdk.frameworks; [ + Cocoa cf-private + ]); doCheck = false; # fails. can't find itself